diff options
| author | Kyle Erf <erf@mongodb.com> | 2016-03-14 15:15:57 -0400 |
|---|---|---|
| committer | Kyle Erf <erf@mongodb.com> | 2016-03-14 15:16:08 -0400 |
| commit | 846e196e5a6c2faaa16678bcf0daae36e4cd7a0d (patch) | |
| tree | 9a00a1f4e7eb3eae2e519f7b032e6d9b87359fb8 | |
| parent | a606292546b943b2f9bf297fdaadc4d46aa740d5 (diff) | |
| download | mongo-846e196e5a6c2faaa16678bcf0daae36e4cd7a0d.tar.gz | |
Revert "SERVER-23088 fix boost's libstdcpp detection under clang"
This reverts commit 3071389ed3476eeb1e6730bbc1f841addf54b383.
| -rw-r--r-- | src/third_party/boost-1.56.0/boost/config/stdlib/libstdcpp3.hpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/third_party/boost-1.56.0/boost/config/stdlib/libstdcpp3.hpp b/src/third_party/boost-1.56.0/boost/config/stdlib/libstdcpp3.hpp index 191cc450641..2fd6ea7d533 100644 --- a/src/third_party/boost-1.56.0/boost/config/stdlib/libstdcpp3.hpp +++ b/src/third_party/boost-1.56.0/boost/config/stdlib/libstdcpp3.hpp @@ -91,18 +91,6 @@ # endif #endif - -// MONGO -// Implement support for clang + libstdc++ similarly to new versions of boost. This is based on -// https://github.com/boostorg/config/blob/boost-1.60.0/include/boost/config/stdlib/libstdcpp3.hpp#L115-L141 -#ifdef __clang__ -#if !__has_include(<ext/cmath>) -#error "MongoDB does not support compiling with libstdc++ older than 4.8 -#elif __has_include(<shared_mutex>) -#define MONGO_CLANG_LIBSTDCPP49 -#endif -#else - // stdlibc++ C++0x support is detected via __GNUC__, __GNUC_MINOR__, and possibly // __GNUC_PATCHLEVEL__ at the suggestion of Jonathan Wakely, one of the stdlibc++ // developers. He also commented: @@ -174,11 +162,7 @@ // Note that although <atomic> existed prior to gcc 4.8 it was largely unimplemented for many types: # define BOOST_NO_CXX11_HDR_ATOMIC #endif - -#endif // MONGO __clang__ - -#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9) || !defined(__GXX_EXPERIMENTAL_CXX0X__) \ - || !defined(MONGO_CLANG_LIBSTDCPP49) +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9) || !defined(__GXX_EXPERIMENTAL_CXX0X__) // Although <regex> is present and compilable against, the actual implementation is not functional // even for the simplest patterns such as "\d" or "[0-9]". This is the case at least in gcc up to 4.8, inclusively. # define BOOST_NO_CXX11_HDR_REGEX |