boostorg/config
1
0
Fork 1
mirror of https://github.com/boostorg/config.git synced 2025-07-31 12:57:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jzmaddock
2014-05-28 18:46:17 +01:00
parent d52482247c 7035bef2c7
commit 32b125612c
4 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,11 +25,12 @@
// //
// Cray peculiarities, probably version 7 specific:
// //
#define BOOST_NO_CXX11_STATIC_ASSERT
#define BOOST_NO_CXX11_AUTO_DECLARATIONS #define BOOST_NO_CXX11_AUTO_DECLARATIONS
#define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS #define BOOST_NO_CXX11_AUTO_MULTIDECLARATIONS
#define BOOST_HAS_NRVO #define BOOST_HAS_NRVO
#define BOOST_NO_CXX11_VARIADIC_MACROS
#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
#define BOOST_NO_CXX11_UNICODE_LITERALS #define BOOST_NO_CXX11_UNICODE_LITERALS
@@ -64,4 +65,24 @@
#define BOOST_SP_USE_PTHREADS #define BOOST_SP_USE_PTHREADS
#define BOOST_AC_USE_PTHREADS #define BOOST_AC_USE_PTHREADS
/* everything that follows is working around what are thought to be
* compiler shortcomings. Revist all of these regularly.
*/
//#define BOOST_USE_ENUM_STATIC_ASSERT
//#define BOOST_BUGGY_INTEGRAL_CONSTANT_EXPRESSIONS //(this may be implied by the previous #define
// These constants should be provided by the
// compiler, at least when -hgnu is asserted on the command line.
#ifndef __ATOMIC_RELAXED
#define __ATOMIC_RELAXED 0
#define __ATOMIC_CONSUME 1
#define __ATOMIC_ACQUIRE 2
#define __ATOMIC_RELEASE 3
#define __ATOMIC_ACQ_REL 4
#define __ATOMIC_SEQ_CST 5
#endif

8
include/boost/config/stdlib/libcpp.hpp
View File

@@ -23,6 +23,14 @@
# define BOOST_NO_CXX11_HDR_TUPLE # define BOOST_NO_CXX11_HDR_TUPLE
#endif #endif
// BOOST_NO_CXX11_ALLOCATOR should imply no support for the C++11
// allocator model. The C++11 allocator model requires a conforming
// std::allocator_traits which is only possible with C++11 template
// aliases since members rebind_alloc and rebind_traits require it.
#if defined(_LIBCPP_HAS_NO_TEMPLATE_ALIASES)
# define BOOST_NO_CXX11_ALLOCATOR
#endif
// //
// These appear to be unusable/incomplete so far: // These appear to be unusable/incomplete so far:
// //

2
test/boost_no_cxx11_allocator.ipp
View File

@@ -31,11 +31,13 @@ int test()
std::allocator<int> ia; std::allocator<int> ia;
std::allocator_traits<std::allocator<int> >::rebind_alloc<void*> ra(ia); std::allocator_traits<std::allocator<int> >::rebind_alloc<void*> ra(ia);
std::allocator<void*>* pva = &ra; std::allocator<void*>* pva = &ra;
std::allocator_traits<std::allocator<int> >::rebind_traits<void*>::pointer pt;
(void)aat; (void)aat;
(void)ua; (void)ua;
(void)at; (void)at;
(void)pva; (void)pva;
(void)pt;
return 0; return 0;
} }

2
test/boost_no_cxx11_hdr_regex.ipp
View File

@@ -1,5 +1,5 @@
// (C) Copyright Beman Dawes 2009 // (C) Copyright Beman Dawes 2009
// Copyright (c) Microsoft Corporation
// 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)