feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
jzmaddock
2016-09-20 17:02:12 +01:00
parent 09beda8c1a 7d7c25bb26
commit 606cc77268
3 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/config/compiler/sunpro_cc.hpp
View File

@ -170,6 +170,13 @@
#if !defined(__cpp_variable_templates) || (__cpp_variable_templates < 201304) #if !defined(__cpp_variable_templates) || (__cpp_variable_templates < 201304)
# define BOOST_NO_CXX14_VARIABLE_TEMPLATES # define BOOST_NO_CXX14_VARIABLE_TEMPLATES
#endif #endif
// Turn on threading support for Solaris 12.
// Ticket #11972
#if (__SUNPRO_CC >= 0x5140) && defined(__SunOS_5_12) && !defined(BOOST_HAS_THREADS)
# define BOOST_HAS_THREADS
#endif
// //
// Version // Version
// //

6
include/boost/config/stdlib/libstdcpp3.hpp
View File

@ -151,8 +151,12 @@
// Oracle Solaris compiler uses it's own verison of libstdc++ but doesn't // Oracle Solaris compiler uses it's own verison of libstdc++ but doesn't
// set __GNUC__ // set __GNUC__
// //
#if __SUNPRO_CC >= 0x5140
#define BOOST_LIBSTDCXX_VERSION 50100
#else
#define BOOST_LIBSTDCXX_VERSION 40800 #define BOOST_LIBSTDCXX_VERSION 40800
#endif #endif
#endif
#if !defined(BOOST_LIBSTDCXX_VERSION) #if !defined(BOOST_LIBSTDCXX_VERSION)
# define BOOST_LIBSTDCXX_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) # define BOOST_LIBSTDCXX_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
@ -259,7 +263,7 @@
// //
// Headers not present on Solaris with the Oracle compiler: // Headers not present on Solaris with the Oracle compiler:
#if defined(__SUNPRO_CC) #if defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5140)
#define BOOST_NO_CXX11_HDR_FUTURE #define BOOST_NO_CXX11_HDR_FUTURE
#define BOOST_NO_CXX11_HDR_FORWARD_LIST #define BOOST_NO_CXX11_HDR_FORWARD_LIST
#define BOOST_NO_CXX11_HDR_ATOMIC #define BOOST_NO_CXX11_HDR_ATOMIC

16
include/boost/config/suffix.hpp
View File

@ -624,12 +624,22 @@ namespace std{ using ::type_info; }
# define BOOST_NORETURN __declspec(noreturn) # define BOOST_NORETURN __declspec(noreturn)
# elif defined(__GNUC__) # elif defined(__GNUC__)
# define BOOST_NORETURN __attribute__ ((__noreturn__)) # define BOOST_NORETURN __attribute__ ((__noreturn__))
# else # elif defined(__has_attribute) && defined(__SUNPRO_CC)
# define BOOST_NO_NORETURN # if __has_attribute(noreturn)
# define BOOST_NORETURN # define BOOST_NORETURN [[noreturn]]
# endif
# elif defined(__has_cpp_attribute)
# if __has_cpp_attribute(noreturn)
# define BOOST_NORETURN [[noreturn]]
# endif
# endif # endif
#endif #endif
#if !defined(BOOST_NORETURN)
# define BOOST_NO_NORETURN
# define BOOST_NORETURN
#endif
// Branch prediction hints // Branch prediction hints
// These macros are intended to wrap conditional expressions that yield true or false // These macros are intended to wrap conditional expressions that yield true or false
// //