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

Merge branch 'develop' of https://github.com/boostorg/config into develop

Browse Source
This commit is contained in:
Edward Diener
2013-12-11 18:54:56 -05:00
parent ceafb39c24 ba89303d51
commit 49fc1e99ef
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
// (C) Copyright John Maddock 2011. // (C) Copyright John Maddock 2011.
// (C) Copyright Cray, Inc. 2013
// Use, modification and distribution are subject to the // Use, modification and distribution are subject to the
// Boost Software License, Version 1.0. (See accompanying file // Boost Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@ -9,8 +10,8 @@
#define BOOST_COMPILER "Cray C version " BOOST_STRINGIZE(_RELEASE) #define BOOST_COMPILER "Cray C version " BOOST_STRINGIZE(_RELEASE)
#if _RELEASE < 7 #if _RELEASE < 8
# error "Boost is not configured for Cray compilers prior to version 7, please try the configure script." # error "Boost is not configured for Cray compilers prior to version 8, please try the configure script."
#endif #endif
// //
@ -22,11 +23,12 @@
#include "boost/config/compiler/common_edg.hpp" #include "boost/config/compiler/common_edg.hpp"
// //
// Cray peculiarities, probably version 7 specific: // Cray peculiarities, probably version 7 specific:
// //
#undef BOOST_NO_CXX11_AUTO_DECLARATIONS #define BOOST_NO_CXX11_AUTO_DECLARATIONS
#undef BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS #define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#define BOOST_HAS_NRVO #define BOOST_HAS_NRVO
#define BOOST_NO_CXX11_VARIADIC_TEMPLATES #define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX #define BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX
@ -55,11 +57,11 @@
#define BOOST_NO_COMPLETE_VALUE_INITIALIZATION #define BOOST_NO_COMPLETE_VALUE_INITIALIZATION
#define BOOST_NO_CXX11_CHAR32_T #define BOOST_NO_CXX11_CHAR32_T
#define BOOST_NO_CXX11_CHAR16_T #define BOOST_NO_CXX11_CHAR16_T
#define BOOST_NO_CXX11_ALIGNAS
//#define BOOST_BCB_PARTIAL_SPECIALIZATION_BUG //#define BOOST_BCB_PARTIAL_SPECIALIZATION_BUG
#define BOOST_MATH_DISABLE_STD_FPCLASSIFY #define BOOST_MATH_DISABLE_STD_FPCLASSIFY
//#define BOOST_HAS_FPCLASSIFY //#define BOOST_HAS_FPCLASSIFY
#define BOOST_SP_USE_PTHREADS #define BOOST_SP_USE_PTHREADS
#define BOOST_AC_USE_PTHREADS #define BOOST_AC_USE_PTHREADS

8
include/boost/config/compiler/visualc.hpp
View File

@ -57,11 +57,6 @@
# define BOOST_NO_CXX11_VARIADIC_MACROS # define BOOST_NO_CXX11_VARIADIC_MACROS
#endif #endif
#if defined(UNDER_CE)
// Windows CE does not have a conforming signature for swprintf
# define BOOST_NO_SWPRINTF
#endif
#if _MSC_VER < 1500 // 140X == VC++ 8.0 #if _MSC_VER < 1500 // 140X == VC++ 8.0
# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
#endif #endif
@ -92,6 +87,7 @@
#endif #endif
#if defined(_WIN32_WCE) || defined(UNDER_CE) #if defined(_WIN32_WCE) || defined(UNDER_CE)
// Windows CE does not have a conforming signature for swprintf
# define BOOST_NO_SWPRINTF # define BOOST_NO_SWPRINTF
#endif #endif
@ -120,7 +116,7 @@
# define BOOST_HAS_NRVO # define BOOST_HAS_NRVO
#endif #endif
// //
// disable Win32 API's if compiler extentions are // disable Win32 API's if compiler extensions are
// turned off: // turned off:
// //
#if !defined(_MSC_EXTENSIONS) && !defined(BOOST_DISABLE_WIN32) #if !defined(_MSC_EXTENSIONS) && !defined(BOOST_DISABLE_WIN32)