diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index fe09aa7e..26301d59 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -83,9 +83,7 @@ test-suite "serialization" : [ test-bsl-run_files test_mi ] [ test-bsl-run_files test_multiple_ptrs : A ] [ test-bsl-run_files test_multiple_inheritance ] - [ test-bsl-run_files test_no_rtti - : polymorphic_base polymorphic_derived1 - ] + [ test-bsl-run_files test_no_rtti : polymorphic_base polymorphic_derived1 ] [ test-bsl-run_files test_non_intrusive ] [ test-bsl-run_files test_non_default_ctor ] [ test-bsl-run_files test_non_default_ctor2 ] @@ -144,6 +142,7 @@ if ! $(BOOST_ARCHIVE_LIST) { [ compile-fail test_const_load_fail1_nvp.cpp ] [ compile-fail test_const_load_fail2_nvp.cpp ] [ compile-fail test_const_load_fail3_nvp.cpp ] + [ compile-fail test_check.cpp ] # should compile with a warning message [ compile test_static_warning.cpp ] diff --git a/test/test_binary.cpp b/test/test_binary.cpp index f0317a8a..e5a803a4 100644 --- a/test/test_binary.cpp +++ b/test/test_binary.cpp @@ -76,20 +76,36 @@ int test_main( int /* argc */, char* /* argv */[] ) char s1_3[10]; char s1_4[10]; int i1 = 34790; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); boost::serialization::make_nvp( - "s1", boost::serialization::make_binary_object(s1, sizeof(s1)) + "s1", + boost::serialization::make_binary_object( + s1, + sizeof(s1) + ) ); oa << boost::serialization::make_nvp( - "s2", boost::serialization::make_binary_object(s2, sizeof(s2)) + "s2", + boost::serialization::make_binary_object( + s2, + sizeof(s2) + ) ); oa << boost::serialization::make_nvp( - "s3", boost::serialization::make_binary_object(s3, sizeof(s3)) + "s3", + boost::serialization::make_binary_object( + s3, + sizeof(s3) + ) ); oa << boost::serialization::make_nvp( - "s4", boost::serialization::make_binary_object(s4, sizeof(s4)) + "s4", + boost::serialization::make_binary_object( + s4, + sizeof(s4) + ) ); oa << BOOST_SERIALIZATION_NVP(a); // note: add a little bit on the end of the archive to detect @@ -100,16 +116,32 @@ int test_main( int /* argc */, char* /* argv */[] ) test_istream is(testfile, TEST_STREAM_FLAGS); test_iarchive ia(is, TEST_ARCHIVE_FLAGS); boost::serialization::make_nvp( - "s1", boost::serialization::make_binary_object(s1_1, sizeof(s1)) + "s1", + boost::serialization::make_binary_object( + s1_1, + sizeof(s1) + ) ); ia >> boost::serialization::make_nvp( - "s2", boost::serialization::make_binary_object(s1_2, sizeof(s2)) + "s2", + boost::serialization::make_binary_object( + s1_2, + sizeof(s2) + ) ); ia >> boost::serialization::make_nvp( - "s3", boost::serialization::make_binary_object(s1_3, sizeof(s3)) + "s3", + boost::serialization::make_binary_object( + s1_3, + sizeof(s3) + ) ); ia >> boost::serialization::make_nvp( - "s4", boost::serialization::make_binary_object(s1_4, sizeof(s4)) + "s4", + boost::serialization::make_binary_object( + s1_4, + sizeof(s4) + ) ); ia >> BOOST_SERIALIZATION_NVP(a1); // note: add a little bit on the end of the archive to detect diff --git a/test/test_tracking.cpp b/test/test_tracking.cpp index d220956c..9f4b47c0 100644 --- a/test/test_tracking.cpp +++ b/test/test_tracking.cpp @@ -128,4 +128,3 @@ test_main( int /* argc */, char* /* argv */[] ) return EXIT_SUCCESS; } -// EOF