Author: sebor
Date: Tue Sep 27 11:39:18 2005
New Revision: 292014
URL: http://svn.apache.org/viewcvs?rev=292014&view=rev
Log:
2005-09-27 Martin Sebor <[EMAIL PROTECTED]>
STDCXX-42
* bitset (to_string): Corrected the preprocessor conditional guarding
the definition of the member function to be the same as the one used
to guard its declaration in the body of the template.
Modified:
incubator/stdcxx/trunk/include/bitset
Modified: incubator/stdcxx/trunk/include/bitset
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/bitset?rev=292014&r1=292013&r2=292014&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/bitset (original)
+++ incubator/stdcxx/trunk/include/bitset Tue Sep 27 11:39:18 2005
@@ -3,7 +3,7 @@
*
* <bitset> - definition of the bitset template
*
- * $Id: //stdlib/dev/include/bitset#70 $
+ * $Id$
*
***************************************************************************
*
@@ -593,7 +593,8 @@
#if !defined (_RWSTD_NO_MEMBER_TEMPLATES) \
- && !defined (_RWSTD_NO_TEMPLATE_ON_RETURN_TYPE)
+ && !defined (_RWSTD_NO_TEMPLATE_ON_RETURN_TYPE) \
+ && !defined (_RWSTD_NO_MEMBER_TEMPLATE_OVERLOAD)
// 23.3.5.2, p33
template <_RWSTD_SIZE_T _Size>
@@ -611,7 +612,7 @@
return __s;
}
-#else // _RWSTD_NO_MEMBER_TEMPLATES || _RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
+#else // _NO_MEMBER_TEMPLATES || _NO_TEMPLATE_ON_RETURN_TYPE ...
// 23.3.5.2, p33
template <_RWSTD_SIZE_T _Size>
@@ -628,7 +629,7 @@
return __s;
}
-#endif // !_RWSTD_NO_MEMBER_TEMPLATES && !_RWSTD_NO_TEMPLATE_ON_RETURN_TYPE
+#endif // !_NO_MEMBER_TEMPLATES && !_NO_TEMPLATE_ON_RETURN_TYPE ...
// 23.3.5.3, p1
