Merge changes from Trunk.

[SVN r50531]
2009-01-10 11:18:42 +00:00
parent 63ec21a0d6
commit 40c8299a25
28 changed files with 236 additions and 43 deletions
@@ -135,11 +135,16 @@ BOOST_LIB_VERSION:    The Boost version, in the form x_y, for Boost version x.y.
   // vc80:
 #  define BOOST_LIB_TOOLSET "vc80"

-#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1500)
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1500)

   // vc90:
 #  define BOOST_LIB_TOOLSET "vc90"

+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)
+
+   // vc10:
+#  define BOOST_LIB_TOOLSET "vc100"
+
 #elif defined(__BORLANDC__)

   // CBuilder 6:
@@ -79,6 +79,7 @@

 #  define BOOST_HAS_MACRO_USE_FACET

+#  define BOOST_NO_INITIALIZER_LISTS

   // On non-Win32 platforms let the platform config figure this out:
 # ifdef _WIN32
@@ -22,6 +22,11 @@
 #  define BOOST_NO_DEPENDENT_TYPES_IN_TEMPLATE_VALUE_PARAMETERS
 #  define BOOST_NO_VOID_RETURNS
 #  define BOOST_NO_EXCEPTION_STD_NAMESPACE
+
+#  if BOOST_MSVC == 1202
+#    define BOOST_NO_STD_TYPEINFO
+#  endif
+
   // disable min/max macro defines on vc6:
   //
 #endif
@@ -79,7 +84,7 @@
 #  define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
 #endif

-#if _MSC_VER <= 1500  // 1500 == VC++ 9.0
+#if _MSC_VER <= 1600  // 1600 == VC++ 10.0
 #  define BOOST_NO_TWO_PHASE_NAME_LOOKUP
 #endif

@@ -179,6 +184,8 @@
 #     define BOOST_COMPILER_VERSION 8.0
 #   elif _MSC_VER == 1500
 #     define BOOST_COMPILER_VERSION 9.0
+#   elif _MSC_VER == 1600
+#     define BOOST_COMPILER_VERSION 10.0
 #   else
 #     define BOOST_COMPILER_VERSION _MSC_VER
 #   endif
@@ -194,7 +201,7 @@
 #endif
 //
 // last known and checked version is 1500 (VC9):
-#if (_MSC_VER > 1500)
+#if (_MSC_VER > 1600)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else
@@ -36,7 +36,8 @@
 // FreeBSD 3.x has pthreads support, but defines _POSIX_THREADS in <pthread.h>
 // and not in <unistd.h>
 //
-#if (defined(__FreeBSD__) && (__FreeBSD__ <= 3)) || defined(__OpenBSD__)
+#if (defined(__FreeBSD__) && (__FreeBSD__ <= 3))\
+   || defined(__OpenBSD__) || defined(__DragonFly__) 
 #  define BOOST_HAS_PTHREADS
 #endif

@@ -55,13 +56,13 @@
 #endif

 #if !((defined(__FreeBSD__) && (__FreeBSD__ >= 5)) \
-      || (__NetBSD_GCC__ >= 2095003))
+      || (__NetBSD_GCC__ >= 2095003) || defined(__DragonFly__))
 #  define BOOST_NO_CWCHAR
 #endif
 //
 // The BSD <ctype.h> has macros only, no functions:
 //
-#if !defined(__OpenBSD__)
+#if !defined(__OpenBSD__) || defined(__DragonFly__)
 #  define BOOST_NO_CTYPE_FUNCTIONS
 #endif

@@ -78,6 +78,11 @@
 #  define BOOST_NO_STD_ITERATOR_TRAITS
 #endif

+//
+// No std::unordered_* containers yet:
+//
+#define BOOST_NO_STD_UNORDERED
+
 #if defined(__ICL) && (__ICL < 800) && defined(_CPPLIB_VER) && (_CPPLIB_VER <= 310)
 // Intel C++ chokes over any non-trivial use of <locale>
 // this may be an overly restrictive define, but regex fails without it:
@@ -32,6 +32,10 @@
 #  define BOOST_HAS_HASH
 #  define BOOST_HAS_SLIST
 #endif
+//
+// We never have the new C++0x unordered containers:
+//
+#define BOOST_NO_STD_UNORDERED

 //
 // Intrinsic type_traits support.
@@ -76,3 +76,8 @@
 #   define BOOST_HASH_MAP_HEADER <backward/hash_map>
 # endif
 #endif
+
+#ifndef __GXX_EXPERIMENTAL_CXX0X__
+#  define BOOST_NO_STD_UNORDERED
+#endif
+
@@ -21,6 +21,10 @@
 #ifndef MSIPL_WCHART
 #define BOOST_NO_STD_WSTRING
 #endif
+//
+// We never have the new C++0x unordered containers:
+//
+#define BOOST_NO_STD_UNORDERED

 #define BOOST_STDLIB "Modena C++ standard library"

@@ -45,6 +45,10 @@
 #  define BOOST_NO_STD_USE_FACET
 #  define BOOST_HAS_TWO_ARG_USE_FACET
 #endif
+//
+// We never have the new C++0x unordered containers:
+//
+#define BOOST_NO_STD_UNORDERED


 #define BOOST_STDLIB "Metrowerks Standard Library version " BOOST_STRINGIZE(__MSL_CPP__)
@@ -151,3 +151,9 @@
 #    define _HP_INSTANTIATE_STD2_VL
 #  endif
 #endif
+
+//
+// We never have the new C++0x unordered containers:
+//
+#define BOOST_NO_STD_UNORDERED
+
@@ -76,6 +76,7 @@
 //
 #define BOOST_HAS_HASH
 #define BOOST_HAS_SLIST
+#define BOOST_NO_STD_UNORDERED

 //
 // If this is GNU libstdc++2, then no <limits> and no std::wstring:
@@ -61,6 +61,9 @@
 #  endif
 #endif

+#if defined(_STLPORT_VERSION) && (_STLPORT_VERSION < 0x500)
+#  define BOOST_NO_STD_UNORDERED
+#endif
 //
 // Without member template support enabled, their are no template
 // iterate constructors, and no std::allocator:
@@ -11,6 +11,7 @@

 #define BOOST_HAS_MACRO_USE_FACET
 #define BOOST_NO_STD_MESSAGES
+#define BOOST_NO_STD_UNORDERED

 #define BOOST_STDLIB "Visual Age default standard library"

@@ -223,7 +223,8 @@
 // from here then add to the appropriate compiler section):
 //
 #if (defined(__MT__) || defined(_MT) || defined(_REENTRANT) \
-    || defined(_PTHREADS)) && !defined(BOOST_HAS_THREADS)
+    || defined(_PTHREADS) || defined(__APPLE__) || defined(__DragonFly__)) \
+    && !defined(BOOST_HAS_THREADS)
 #  define BOOST_HAS_THREADS
 #endif