forked from boostorg/config
Fix buggy test cases.
VC++ has <atomic> in recent versions.
This commit is contained in:
@@ -142,12 +142,9 @@
|
|||||||
//
|
//
|
||||||
#if !defined(_CPPLIB_VER) || _CPPLIB_VER < 610
|
#if !defined(_CPPLIB_VER) || _CPPLIB_VER < 610
|
||||||
# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
|
# define BOOST_NO_CXX11_HDR_INITIALIZER_LIST
|
||||||
|
# define BOOST_NO_CXX11_HDR_ATOMIC
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Not present in any version:
|
|
||||||
//
|
|
||||||
#define BOOST_NO_CXX11_HDR_ATOMIC
|
|
||||||
|
|
||||||
#ifdef _CPPLIB_VER
|
#ifdef _CPPLIB_VER
|
||||||
# define BOOST_DINKUMWARE_STDLIB _CPPLIB_VER
|
# define BOOST_DINKUMWARE_STDLIB _CPPLIB_VER
|
||||||
#else
|
#else
|
||||||
|
@@ -24,7 +24,7 @@
|
|||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include "test.hpp"
|
#include "test.hpp"
|
||||||
|
|
||||||
#ifdef BOOST_NO_CXX11_ATOMIC_SMART_PTR
|
#ifdef BOOST_NO_CXX11_HDR_ATOMIC
|
||||||
#include "boost_no_cxx11_hdr_atomic.ipp"
|
#include "boost_no_cxx11_hdr_atomic.ipp"
|
||||||
#else
|
#else
|
||||||
#error "this file should not compile"
|
#error "this file should not compile"
|
||||||
@@ -32,6 +32,6 @@
|
|||||||
|
|
||||||
int main( int, char *[] )
|
int main( int, char *[] )
|
||||||
{
|
{
|
||||||
return boost_no_cxx11_atomic_smart_ptr::test();
|
return boost_no_cxx11_hdr_atomic::test();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -24,14 +24,14 @@
|
|||||||
#include <boost/config.hpp>
|
#include <boost/config.hpp>
|
||||||
#include "test.hpp"
|
#include "test.hpp"
|
||||||
|
|
||||||
#ifndef BOOST_NO_CXX11_ATOMIC_SMART_PTR
|
#ifndef BOOST_NO_CXX11_HDR_ATOMIC
|
||||||
#include "boost_no_cxx11_hdr_atomic.ipp"
|
#include "boost_no_cxx11_hdr_atomic.ipp"
|
||||||
#else
|
#else
|
||||||
namespace boost_no_cxx11_atomic_smart_ptr = empty_boost;
|
namespace boost_no_cxx11_hdr_atomic = empty_boost;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int main( int, char *[] )
|
int main( int, char *[] )
|
||||||
{
|
{
|
||||||
return boost_no_cxx11_atomic_smart_ptr::test();
|
return boost_no_cxx11_hdr_atomic::test();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user