comparison DEPENDENCIES/generic/include/boost/numeric/ublas/detail/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 #include <boost/type_traits/is_same.hpp> 26 #include <boost/type_traits/is_same.hpp>
27 #include <boost/type_traits/is_convertible.hpp> 27 #include <boost/type_traits/is_convertible.hpp>
28 #include <boost/type_traits/is_const.hpp> 28 #include <boost/type_traits/is_const.hpp>
29 #include <boost/type_traits/remove_reference.hpp> 29 #include <boost/type_traits/remove_reference.hpp>
30 30
31 // C++11
32 #if defined(__cplusplus) && __cplusplus >= 201103L
33
34 #define BOOST_UBLAS_CPP_GE_2011
35
36 #elif BOOST_MSVC >= 1800
37
38 #define BOOST_UBLAS_CPP_GE_2011
39
40 #else
41
42 #undef BOOST_UBLAS_CPP_GE_2011 // Make sure no one defined it
43
44 #endif
31 45
32 // Microsoft Visual C++ 46 // Microsoft Visual C++
33 #if defined (BOOST_MSVC) && ! defined (BOOST_STRICT_CONFIG) 47 #if defined (BOOST_MSVC) && ! defined (BOOST_STRICT_CONFIG)
34
35 // Version 6.0 and 7.0
36 #if BOOST_MSVC <= 1300
37 #define BOOST_UBLAS_UNSUPPORTED_COMPILER 1
38 #endif
39 48
40 // Version 7.1 49 // Version 7.1
41 #if BOOST_MSVC == 1310 50 #if BOOST_MSVC == 1310
42 // One of these workarounds is needed for MSVC 7.1 AFAIK 51 // One of these workarounds is needed for MSVC 7.1 AFAIK
43 // (thanks to John Maddock and Martin Lauer). 52 // (thanks to John Maddock and Martin Lauer).
162 #endif 171 #endif
163 172
164 173
165 // Detect other compilers with serious defects - override by defineing BOOST_UBLAS_UNSUPPORTED_COMPILER=0 174 // Detect other compilers with serious defects - override by defineing BOOST_UBLAS_UNSUPPORTED_COMPILER=0
166 #ifndef BOOST_UBLAS_UNSUPPORTED_COMPILER 175 #ifndef BOOST_UBLAS_UNSUPPORTED_COMPILER
167 #if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) || defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || defined(BOOST_NO_SFINAE) || defined(BOOST_NO_STDC_NAMESPACE) 176 #if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) || defined(BOOST_NO_SFINAE) || defined(BOOST_NO_STDC_NAMESPACE)
168 #define BOOST_UBLAS_UNSUPPORTED_COMPILER 1 177 #define BOOST_UBLAS_UNSUPPORTED_COMPILER 1
169 #endif 178 #endif
170 #endif 179 #endif
171 180
172 // Cannot continue with an unsupported compiler 181 // Cannot continue with an unsupported compiler
290 #include <boost/numeric/ublas/fwd.hpp> 299 #include <boost/numeric/ublas/fwd.hpp>
291 #include <boost/numeric/ublas/detail/definitions.hpp> 300 #include <boost/numeric/ublas/detail/definitions.hpp>
292 301
293 302
294 #endif 303 #endif
304