Mercurial > hg > vamp-build-and-test
comparison DEPENDENCIES/generic/include/boost/config/select_stdlib_config.hpp @ 101:c530137014c0
Update Boost headers (1.58.0)
author | Chris Cannam |
---|---|
date | Mon, 07 Sep 2015 11:12:49 +0100 |
parents | 2665513ce2d3 |
children |
comparison
equal
deleted
inserted
replaced
100:793467b5e61c | 101:c530137014c0 |
---|---|
26 // can end up detecting that first rather than STLport: | 26 // can end up detecting that first rather than STLport: |
27 # define BOOST_STDLIB_CONFIG "boost/config/stdlib/stlport.hpp" | 27 # define BOOST_STDLIB_CONFIG "boost/config/stdlib/stlport.hpp" |
28 | 28 |
29 #else | 29 #else |
30 | 30 |
31 // If our std lib was not some version of STLport, then include <utility> as it is about | 31 // If our std lib was not some version of STLport, and has not otherwise |
32 // the smallest of the std lib headers that includes real C++ stuff. (Some std libs do not | 32 // been detected, then include <utility> as it is about |
33 // include their C++-related macros in <cstddef> so this additional include makes sure | 33 // the smallest of the std lib headers that includes real C++ stuff. |
34 // we get those definitions) | 34 // Some std libs do not include their C++-related macros in <cstddef> |
35 // (again do not rely on this header being included since users can short-circuit this | 35 // so this additional include makes sure we get those definitions. |
36 // header if they know whose std lib they are using.) | 36 // Note: do not rely on this header being included since users can short-circuit this |
37 #include <boost/config/no_tr1/utility.hpp> | 37 // #include if they know whose std lib they are using. |
38 #if !defined(__LIBCOMO__) && !defined(__STD_RWCOMPILER_H__) && !defined(_RWSTD_VER)\ | |
39 && !defined(_LIBCPP_VERSION) && !defined(__GLIBCPP__) && !defined(__GLIBCXX__)\ | |
40 && !defined(__STL_CONFIG_H) && !defined(__MSL_CPP__) && !defined(__IBMCPP__)\ | |
41 && !defined(MSIPL_COMPILE_H) && !defined(_YVALS) && !defined(_CPPLIB_VER) | |
42 #include <utility> | |
43 #endif | |
38 | 44 |
39 #if defined(__LIBCOMO__) | 45 #if defined(__LIBCOMO__) |
40 // Comeau STL: | 46 // Comeau STL: |
41 #define BOOST_STDLIB_CONFIG "boost/config/stdlib/libcomo.hpp" | 47 #define BOOST_STDLIB_CONFIG "boost/config/stdlib/libcomo.hpp" |
42 | 48 |
79 | 85 |
80 #endif | 86 #endif |
81 | 87 |
82 #endif | 88 #endif |
83 | 89 |
90 #if 0 | |
91 // | |
92 // This section allows dependency scanners to find all the files we *might* include: | |
93 // | |
94 # include "boost/config/stdlib/stlport.hpp" | |
95 # include "boost/config/stdlib/libcomo.hpp" | |
96 # include "boost/config/stdlib/roguewave.hpp" | |
97 # include "boost/config/stdlib/libcpp.hpp" | |
98 # include "boost/config/stdlib/libstdcpp3.hpp" | |
99 # include "boost/config/stdlib/sgi.hpp" | |
100 # include "boost/config/stdlib/msl.hpp" | |
101 # include "boost/config/stdlib/vacpp.hpp" | |
102 # include "boost/config/stdlib/modena.hpp" | |
103 # include "boost/config/stdlib/dinkumware.hpp" | |
104 #endif | |
84 | 105 |
85 |