boost/serialization
2
0
Fork 0
mirror of https://github.com/boostorg/serialization.git synced 2026-02-22 03:32:25 +00:00
Code Issues Projects Releases Wiki Activity

misc fixes in tests to condition of C++11 support

Browse Source 
another fix for S Kelly fiasco.
This commit is contained in:
Robert Ramey
2014-02-07 10:01:12 -08:00
parent 2140063d82
commit da757049e5
5 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/test_array.cpp
View File

@@ -8,6 +8,8 @@
// should pass compilation and execution
#include <boost/config.hpp>
#include <cstddef>
#include <fstream>
#ifndef BOOST_NO_CXX11_HDR_ARRAY
@@ -15,7 +17,6 @@
#endif
#include <algorithm> // equal
#include <cstdio> // remove
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::remove;
@@ -204,8 +205,9 @@ int test_main( int /* argc */, char* /* argv */[] )
res = test_std_array<int>();
if (res != EXIT_SUCCESS)
return EXIT_FAILURE;
return EXIT_SUCCESS;
#endif
return EXIT_SUCCESS;
}
// EOF

8
test/test_map.cpp
View File

@@ -215,6 +215,8 @@ test_hash_multimap(){
}
#endif
#ifndef BOOST_NO_CXX11_HDR_UNORDERED_MAP
#include <boost/serialization/unordered_map.hpp>
#include <functional> // requires changeset [69520]; Ticket #5254
@@ -290,17 +292,23 @@ test_unordered_multimap(){
std::remove(testfile);
}
#endif
int test_main( int /* argc */, char* /* argv */[] )
{
test_map();
test_map_2();
test_multimap();
#ifdef BOOST_HAS_HASH
test_hash_map();
test_hash_multimap();
#endif
#ifndef BOOST_NO_CXX11_HDR_UNORDERED_MAP
test_unordered_map();
test_unordered_multimap();
#endif
return EXIT_SUCCESS;
}

8
test/test_set.cpp
View File

@@ -165,7 +165,8 @@ test_hash_multiset(){
}
#endif
#ifndef BOOST_NO_CXX11_STD_UNORDERED
#ifndef BOOST_NO_CXX11_HDR_UNORDERED_SET
#include <boost/serialization/unordered_set.hpp>
#include <functional> // requires changeset [69520]; Ticket #5254
@@ -246,13 +247,16 @@ test_unordered_multiset(){
int test_main( int /* argc */, char* /* argv */[] ){
test_set();
test_multiset();
#ifdef BOOST_HAS_HASH
test_hash_set();
test_hash_multiset();
#endif
#ifndef BOOST_NO_CXX11_STD_UNORDERED
#ifndef BOOST_NO_CXX11_HDR_UNORDERED_SET
test_unordered_set();
test_unordered_multiset();
#endif
return EXIT_SUCCESS;
}