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

adjustment for QNX

Browse Source 
altered Jamfiles to fix test with DLLS on static builds

[SVN r79951]
This commit is contained in:
Robert Ramey
2012-08-10 01:39:53 +00:00
parent 6f0659a8e8
commit ca8cb19e53
9 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/Jamfile.v2
View File

@@ -31,7 +31,7 @@ lib dll_a_lib
dll_a.cpp
../build//boost_serialization
:
<link>shared
# <link>shared
;
lib dll_base_lib
@@ -39,7 +39,7 @@ lib dll_base_lib
dll_base.cpp
../build//boost_serialization
:
<link>shared
# <link>shared
;
lib dll_derived2_lib
@@ -48,7 +48,7 @@ lib dll_derived2_lib
dll_base_lib
../build//boost_serialization
:
<link>shared
# <link>shared
;
lib dll_polymorphic_derived2_lib
@@ -56,7 +56,7 @@ lib dll_polymorphic_derived2_lib
polymorphic_derived2.cpp
../build//boost_serialization
:
<link>shared
# <link>shared
;
test-suite "serialization" :
@@ -112,9 +112,12 @@ test-suite "serialization" :
if ! $(BOOST_ARCHIVE_LIST) {
test-suite "serialization2" :
[ test-bsl-run test_dll_exported : : dll_polymorphic_derived2_lib : <runtime-link>shared ]
[ test-bsl-run test_dll_simple : : dll_a_lib : <runtime-link>shared ]
[ test-bsl-run test_dll_exported : : dll_polymorphic_derived2_lib ]
[ test-bsl-run test_dll_simple : : dll_a_lib ]
[ compile test_dll_plugin.cpp ]
# Running the following test requires that the test know the directory
# in which the dll is stored. I don't know how to extract this from bjam
# [ test-bsl-run test_dll_plugin : : dll_polymorphic_derived2_lib ]
[ test-bsl-run test_private_ctor ]
[ test-bsl-run test_reset_object_address : A ]
[ test-bsl-run test_void_cast ]

12
test/polymorphic_base.hpp
View File

@@ -22,7 +22,17 @@
#include <boost/serialization/type_info_implementation.hpp>
#include <boost/serialization/extended_type_info_no_rtti.hpp>
class polymorphic_base
#include "test_decl.hpp"
#if defined(POLYMORPHIC_DERIVED_IMPORT)
#define DLL_DECL IMPORT_DECL
#elif defined(POLYMORPHIC_DERIVED_EXPORT)
#define DLL_DECL EXPORT_DECL
#else
#define DLL_DECL(x)
#endif
class DLL_DECL(BOOST_PP_EMPTY()) polymorphic_base
{
friend class boost::serialization::access;
template<class Archive>

10
test/polymorphic_derived2.hpp
View File

@@ -26,16 +26,6 @@
#include "polymorphic_base.hpp"
#include "test_decl.hpp"
#if defined(POLYMORPHIC_DERIVED2_IMPORT)
#define DLL_DECL IMPORT_DECL
#elif defined(POLYMORPHIC_DERIVED2_EXPORT)
#define DLL_DECL EXPORT_DECL
#else
#define DLL_DECL(x)
#endif
class DLL_DECL(BOOST_PP_EMPTY()) polymorphic_derived2 :
public polymorphic_base
{

13
test/test_complex.cpp
View File

@@ -13,12 +13,17 @@
#include <cstddef> // NULL
#include <cstdlib> // rand
#include <cstdio> // remove
#include <boost/config.hpp>
#include <boost/limits.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
namespace std{
using ::rand;
using ::fabs;
using ::remove;
#ifndef UNDER_CE
using ::numeric_limits;
#endif
#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE)
using ::numeric_limits;
#endif
}
#endif

2
test/test_dll_exported.cpp
View File

@@ -66,7 +66,7 @@ BOOST_CLASS_EXPORT(polymorphic_derived1)
// MWerks users can do this to make their code work
BOOST_SERIALIZATION_MWERKS_BASE_AND_DERIVED(polymorphic_base, polymorphic_derived1)
#define POLYMORPHIC_DERIVED2_IMPORT
#define POLYMORPHIC_DERIVED_IMPORT
#include "polymorphic_derived2.hpp"
// save exported polymorphic class

9
test/test_non_default_ctor.cpp
View File

@@ -18,15 +18,16 @@
#include <cstdlib> // for rand()
#include <cmath> // for fabs()
#include <boost/config.hpp>
#include <boost/limits.hpp>
#include <boost/limits.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::rand;
using ::fabs;
using ::remove;
#ifndef UNDER_CE
using ::numeric_limits;
#endif
#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE)
using ::numeric_limits;
#endif
}
#endif

11
test/test_non_intrusive.cpp
View File

@@ -18,14 +18,15 @@
#include <cmath> // for fabs()
#include <boost/config.hpp>
#include <boost/limits.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::rand;
using ::fabs;
using ::rand;
using ::fabs;
using ::remove;
#ifndef UNDER_CE
using ::numeric_limits;
#endif
#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE)
using ::numeric_limits;
#endif
}
#endif