You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2008/07/10 02:37:44 UTC
svn commit: r675390 - in /stdcxx/branches/4.3.x/include/rw: _ioinsert.cc
_select.h
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 <se...@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]; };