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

Refactor cray.hpp logic

Browse Source 
- The effect of the logic is the same as before, but it is organized
  according to the outline described in the comments. The only change in
  the logic is that we always include 'common_edg.hpp', since we know we
  are only dealing with EDG based compilers.
This commit is contained in:
Justin LaPolla
2017-12-12 11:54:17 -06:00
parent 745a1eb4f8
commit 790a047107
1 changed files with 60 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
include/boost/config/compiler/cray.hpp
View File

@ -41,9 +41,9 @@
# define BOOST_COMPILER "Cray C++ version " BOOST_STRINGIZE(_RELEASE_MAJOR) "." BOOST_STRINGIZE(_RELEASE_MINOR) "." BOOST_STRINGIZE(_RELEASE_PATCHLEVEL)
#endif
///
/// Parameter validation
///
////
//// Parameter validation
////
// FIXME: Do we really need to support compilers before 8.5? Do they pass
// the Boost.Config tests?
@ -58,16 +58,12 @@
# error "Unsupported Cray compiler, please try running the configure script."
#endif
///
/// Baseline values
///
////
//// Baseline values
////
#include <boost/config/compiler/common_edg.hpp>
#if _RELEASE_MINOR < 5 || __cplusplus < 201100
//
//
#define BOOST_NO_CXX11_STATIC_ASSERT
#define BOOST_NO_CXX11_AUTO_DECLARATIONS
#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
@ -105,7 +101,6 @@
#define BOOST_NO_CXX11_FINAL
#define BOOST_NO_CXX11_THREAD_LOCAL
//#define BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
#define BOOST_MATH_DISABLE_STD_FPCLASSIFY
//#define BOOST_HAS_FPCLASSIFY
@ -132,7 +127,57 @@
#define __ATOMIC_SEQ_CST 5
#endif
#else /* _RELEASE_MINOR */
////
//// Version changes
////
//
// 8.5.0
//
#if BOOST_CRAY_VERSION >= 80500
#if __cplusplus >= 201103
#undef BOOST_NO_CXX11_STATIC_ASSERT
#undef BOOST_NO_CXX11_AUTO_DECLARATIONS
#undef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#undef BOOST_HAS_NRVO
#undef BOOST_NO_CXX11_VARIADIC_MACROS
#undef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#undef BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
#undef BOOST_NO_CXX11_UNICODE_LITERALS
#undef BOOST_NO_TWO_PHASE_NAME_LOOKUP
#undef BOOST_HAS_NRVO
#undef BOOST_NO_CXX11_TEMPLATE_ALIASES
#undef BOOST_NO_CXX11_STATIC_ASSERT
#undef BOOST_NO_SFINAE_EXPR
#undef BOOST_NO_CXX11_SFINAE_EXPR
#undef BOOST_NO_CXX11_SCOPED_ENUMS
#undef BOOST_NO_CXX11_RVALUE_REFERENCES
#undef BOOST_NO_CXX11_RANGE_BASED_FOR
#undef BOOST_NO_CXX11_RAW_LITERALS
#undef BOOST_NO_CXX11_NULLPTR
#undef BOOST_NO_CXX11_NOEXCEPT
#undef BOOST_NO_CXX11_LAMBDAS
#undef BOOST_NO_CXX11_LOCAL_CLASS_TEMPLATE_PARAMETERS
#undef BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS
#undef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
#undef BOOST_NO_CXX11_DELETED_FUNCTIONS
#undef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
#undef BOOST_NO_CXX11_DECLTYPE_N3276
#undef BOOST_NO_CXX11_DECLTYPE
#undef BOOST_NO_CXX11_CONSTEXPR
#undef BOOST_NO_CXX11_USER_DEFINED_LITERALS
#undef BOOST_NO_COMPLETE_VALUE_INITIALIZATION
#undef BOOST_NO_CXX11_CHAR32_T
#undef BOOST_NO_CXX11_CHAR16_T
#undef BOOST_NO_CXX11_REF_QUALIFIERS
#undef BOOST_NO_CXX11_FINAL
#undef BOOST_NO_CXX11_THREAD_LOCAL
#undef BOOST_MATH_DISABLE_STD_FPCLASSIFY
#undef BOOST_SP_USE_PTHREADS
#undef BOOST_AC_USE_PTHREADS
#define BOOST_HAS_VARIADIC_TMPL
#define BOOST_HAS_UNISTD_H
@ -158,9 +203,9 @@
#if __cplusplus < 201400
#define BOOST_NO_CXX11_DECLTYPE_N3276
#endif /* __cpluspus */
#endif /* _RELEASE_MINOR */
#endif // __cpluspus < 201400
#endif // __cplusplus >= 201103
#endif // BOOST_CRAY_VERSION >= 80500