Merged changes from the RC_1_29_0 branch.

[SVN r15959]
2002-10-21 11:03:05 +00:00
parent e1504cfb2e
commit 9ec9927674
6 changed files with 33 additions and 9 deletions
@@ -21,7 +21,7 @@
 #  if !(defined(_GLOBAL_USING) && (_GLOBAL_USING+0 > 0)) && !defined(_STD)   // can be defined in yvals.h
 #     define BOOST_NO_STDC_NAMESPACE
 #  endif
-#  if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0) && !(defined(_MSC_VER) && (_MSC_VER > 1300)))
+#  if !(defined(_HAS_MEMBER_TEMPLATES_REBIND) && (_HAS_MEMBER_TEMPLATES_REBIND+0 > 0)) && !(defined(_MSC_VER) && (_MSC_VER > 1300))
 #     define BOOST_NO_STD_ALLOCATOR
 #  endif
 #  if defined(_MSC_VER) && (_MSC_VER < 1300)
@@ -5,8 +5,11 @@

 //  See http://www.boost.org for most recent version.

+#if __IBMCPP__ <= 501
+#  define BOOST_NO_STD_ALLOCATOR
+#endif
+
 #define BOOST_HAS_MACRO_USE_FACET
-#define BOOST_NO_STD_ALLOCATOR

 #define BOOST_STDLIB "Visual Age default standard library"