Return-Path: 
 <commits-return-3236-apmail-stdcxx-commits-archive=stdcxx.apache.org@stdcxx.apache.org>
Delivered-To: apmail-stdcxx-commits-archive@www.apache.org
Received: (qmail 66232 invoked from network); 10 Jul 2008 00:38:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 10 Jul 2008 00:38:35 -0000
Received: (qmail 66915 invoked by uid 500); 10 Jul 2008 00:38:35 -0000
Delivered-To: apmail-stdcxx-commits-archive@stdcxx.apache.org
Received: (qmail 66897 invoked by uid 500); 10 Jul 2008 00:38:35 -0000
Mailing-List: contact commits-help@stdcxx.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@stdcxx.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@stdcxx.apache.org>
List-Post: <mailto:commits@stdcxx.apache.org>
List-Id: <commits.stdcxx.apache.org>
Reply-To: dev@stdcxx.apache.org
Delivered-To: mailing list commits@stdcxx.apache.org
Received: (qmail 66888 invoked by uid 99); 10 Jul 2008 00:38:35 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jul 2008 17:38:35 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2008 00:37:52 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 531FD23889F1; Wed,  9 Jul 2008 17:37:44 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r675390 - in /stdcxx/branches/4.3.x/include/rw:
 _ioinsert.cc
 _select.h
Date: Thu, 10 Jul 2008 00:37:44 -0000
To: commits@stdcxx.apache.org
From: sebor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080710003744.531FD23889F1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sebor
Date: Wed Jul  9 17:37:43 2008
New Revision: 675390

URL: http://svn.apache.org/viewvc?rev=675390&view=rev
Log:
2008-07-09  Martin Sebor  <sebor@roguewave.com>

	* include/rw/_select.h (__rw_same_type): Renamed from __rw_is_same
	to avoid conflicts with <rw/_meta_rel.h>.
	* include/rw/_ioinsert.h (__rw_insert): Used __rw_same_type rather
	than __rw_is_same.

Modified:
    stdcxx/branches/4.3.x/include/rw/_ioinsert.cc
    stdcxx/branches/4.3.x/include/rw/_select.h

Modified: stdcxx/branches/4.3.x/include/rw/_ioinsert.cc
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_ioinsert.cc?rev=675390&r1=675389&r2=675390&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_ioinsert.cc (original)
+++ stdcxx/branches/4.3.x/include/rw/_ioinsert.cc Wed Jul  9 17:37:43 2008
@@ -143,7 +143,7 @@
             const _RWSTD_STREAMSIZE __pad = __width - __len;
 
             typedef _TYPENAME
-                __rw_is_same<_CharT, _StringT>::_C_type _Same;
+                __rw_same_type<_CharT, _StringT>::_C_type _Same;
 
             if (__pad > 0) {
                 const int __padbits =

Modified: stdcxx/branches/4.3.x/include/rw/_select.h
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.3.x/include/rw/_select.h?rev=675390&r1=675389&r2=675390&view=diff
==============================================================================
--- stdcxx/branches/4.3.x/include/rw/_select.h (original)
+++ stdcxx/branches/4.3.x/include/rw/_select.h Wed Jul  9 17:37:43 2008
@@ -25,7 +25,7 @@
  * implied.   See  the License  for  the  specific language  governing
  * permissions and limitations under the License.
  *
- * Copyright 1994-2005 Rogue Wave Software.
+ * Copyright 1994-2008 Rogue Wave Software, Inc.
  * 
  **************************************************************************/
 
@@ -100,14 +100,14 @@
 #ifndef _RWSTD_NO_CLASS_PARTIAL_SPEC
 
 template <class _TypeT, class _TypeU>
-struct __rw_is_same
+struct __rw_same_type
 {
     typedef __rw_false_t _C_type;
     enum { _C_val };
 };
 
 template <class _TypeT>
-struct __rw_is_same<_TypeT, _TypeT>
+struct __rw_same_type<_TypeT, _TypeT>
 {
     typedef __rw_true_t _C_type;
     enum { _C_val = 1 };
@@ -128,7 +128,7 @@
 };
 
 template <class _TypeT, class _TypeU>
-struct __rw_is_same
+struct __rw_same_type
 {
     struct _C_yes {};
     struct _C_no { _C_yes no_ [2]; };