diff --git a/example/demo.cpp b/example/demo.cpp index 98e987fd..cfd21277 100644 --- a/example/demo.cpp +++ b/example/demo.cpp @@ -26,11 +26,11 @@ ///////////////////////////////////////////////////////////// // The intent of this program is to serve as a tutorial for // users of the serialization package. An attempt has been made -// to illustrate most of the facilities of the package. +// to illustrate most of the facilities of the package. // // The intent is to create an example suffciently complete to // illustrate the usage and utility of the package while -// including a minimum of other code. +// including a minimum of other code. // // This illustration models the bus system of a small city. // This includes, multiple bus stops, bus routes and schedules. @@ -57,7 +57,7 @@ class gps_position public: // every serializable class needs a constructor gps_position(){}; - gps_position(int _d, int _m, float _s) : + gps_position(int _d, int _m, float _s) : degrees(_d), minutes(_m), seconds(_s) {} }; @@ -147,7 +147,7 @@ class bus_stop_destination : public bus_stop ar & boost::serialization::base_object(*this) & name; } public: - + bus_stop_destination(){} bus_stop_destination( const gps_position & _lat, const gps_position & _long, const std::string & _name @@ -213,7 +213,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br) // Illustrates serialization of STL objects(pair) in a non-intrusive way. // See definition of operator<< >(ar, pair) and others in // serialization.hpp -// +// // illustrates nesting of serializable classes // // illustrates use of version number to automatically grandfather older @@ -299,7 +299,7 @@ restore_schedule(bus_schedule &s, const char * filename) } int main(int argc, char *argv[]) -{ +{ // make the schedule bus_schedule original_schedule; @@ -351,7 +351,7 @@ int main(int argc, char *argv[]) // display the complete schedule std::cout << "original schedule"; std::cout << original_schedule; - + std::string filename(boost::archive::tmpdir()); filename += "/demofile.txt"; diff --git a/example/demo_auto_ptr.cpp b/example/demo_auto_ptr.cpp index 0cca0afe..ff86ac41 100644 --- a/example/demo_auto_ptr.cpp +++ b/example/demo_auto_ptr.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_auto_ptr.cpp -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove, std::autoptr inteface wrong in dinkumware #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -25,7 +25,7 @@ namespace std{ #include -namespace boost { +namespace boost { namespace serialization { ///////////////////////////////////////////////////////////// diff --git a/example/demo_dll_a.hpp b/example/demo_dll_a.hpp index 7adbfe02..0dd5ffb9 100644 --- a/example/demo_dll_a.hpp +++ b/example/demo_dll_a.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // A.hpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) namespace std{ - using ::rand; + using ::rand; using ::fabs; using ::size_t; } @@ -229,12 +229,12 @@ inline bool A::operator==(const A &rhs) const if(o != rhs.o) return false; if(p != rhs.p) - return false; + return false; if(q != rhs.q) return false; #ifndef BOOST_NO_CWCHAR if(r != rhs.r) - return false; + return false; #endif if(c != rhs.c) return false; @@ -243,9 +243,9 @@ inline bool A::operator==(const A &rhs) const if(t != rhs.t) return false; if(u != rhs.u) - return false; + return false; if(v != rhs.v) - return false; + return false; if(std::abs( boost::math::float_distance(w, rhs.w)) > 1) return false; if(std::abs( boost::math::float_distance(x, rhs.x)) > 1) @@ -255,7 +255,7 @@ inline bool A::operator==(const A &rhs) const #ifndef BOOST_NO_STD_WSTRING if(0 != z.compare(rhs.z)) return false; - #endif + #endif return true; } @@ -297,11 +297,11 @@ inline bool A::operator<(const A &rhs) const if(t != rhs.t ) return t < rhs.t; if(u != rhs.u ) - return u < rhs.u; + return u < rhs.u; if(v != rhs.v ) return v < rhs.v; if(w != rhs.w ) - return w < rhs.w; + return w < rhs.w; if(x != rhs.x ) return x < rhs.x; int i = y.compare(rhs.y); diff --git a/example/demo_dll_b.hpp b/example/demo_dll_b.hpp index 0b3d102d..3fcfea67 100644 --- a/example/demo_dll_b.hpp +++ b/example/demo_dll_b.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // B.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -22,7 +22,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) namespace std{ - using ::rand; + using ::rand; } #endif @@ -101,10 +101,10 @@ inline bool B::operator==(const B &rhs) const { return A::operator==(rhs) - && s == rhs.s - && t == rhs.t - && u == rhs.u - && v == rhs.v + && s == rhs.s + && t == rhs.t + && u == rhs.u + && v == rhs.v && std::abs( boost::math::float_distance(w, rhs.w)) < 2 && std::abs( boost::math::float_distance(x, rhs.x)) < 2 ; diff --git a/example/demo_exception.cpp b/example/demo_exception.cpp index 122a05a0..84f881f9 100644 --- a/example/demo_exception.cpp +++ b/example/demo_exception.cpp @@ -1,20 +1,20 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_exception.cpp -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // Example of safe exception handling for pointer de-serialization -// -// This example was prepared by Robert Ramey to demonstrate and test +// +// This example was prepared by Robert Ramey to demonstrate and test // safe exception handling during the de-serialization of pointers in // a non-trivial example. // // Hopefully, this addresses exception issues raised by // Vahan Margaryan who spent considerable time and effort -// in the analysis and testing of issues of exception safety +// in the analysis and testing of issues of exception safety // of the serialization library. #include @@ -26,7 +26,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/example/demo_fast_archive.cpp b/example/demo_fast_archive.cpp index 8e12fd3c..ca813900 100644 --- a/example/demo_fast_archive.cpp +++ b/example/demo_fast_archive.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_fast_binary_archive.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -27,19 +27,19 @@ using namespace boost::archive; /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// "Fast" output binary archive. This is a variation of the native binary +// "Fast" output binary archive. This is a variation of the native binary class fast_binary_oarchive : // don't derive from binary_oarchive !!! public binary_oarchive_impl< - fast_binary_oarchive, - std::ostream::char_type, + fast_binary_oarchive, + std::ostream::char_type, std::ostream::traits_type > { typedef fast_binary_oarchive derived_t; typedef binary_oarchive_impl< - fast_binary_oarchive, - std::ostream::char_type, + fast_binary_oarchive, + std::ostream::char_type, std::ostream::traits_type > base_t; #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS @@ -48,15 +48,15 @@ public: friend class boost::archive::detail::interface_oarchive; friend class basic_binary_oarchive; friend class basic_binary_oprimitive< - derived_t, - std::ostream::char_type, + derived_t, + std::ostream::char_type, std::ostream::traits_type >; friend class boost::archive::save_access; #endif // add base class to the places considered when matching // save function to a specific set of arguments. Note, this didn't - // work on my MSVC 7.0 system using + // work on my MSVC 7.0 system using // binary_oarchive_impl::load_override; // so we use the sure-fire method below. This failed to work as well template @@ -95,19 +95,19 @@ public: BOOST_SERIALIZATION_REGISTER_ARCHIVE(fast_binary_oarchive) /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// "Fast" input binary archive. This is a variation of the native binary +// "Fast" input binary archive. This is a variation of the native binary class fast_binary_iarchive : // don't derive from binary_oarchive !!! public binary_iarchive_impl< - fast_binary_iarchive, - std::istream::char_type, + fast_binary_iarchive, + std::istream::char_type, std::istream::traits_type > { typedef fast_binary_iarchive derived_t; typedef binary_iarchive_impl< - fast_binary_iarchive, - std::istream::char_type, + fast_binary_iarchive, + std::istream::char_type, std::istream::traits_type > base_t; #ifndef BOOST_NO_MEMBER_TEMPLATE_FRIENDS @@ -116,15 +116,15 @@ public: friend class boost::archive::detail::interface_iarchive; friend class basic_binary_iarchive; friend class basic_binary_iprimitive< - derived_t, - std::ostream::char_type, + derived_t, + std::ostream::char_type, std::ostream::traits_type >; friend class boost::archive::load_access; #endif // add base class to the places considered when matching // save function to a specific set of arguments. Note, this didn't - // work on my MSVC 7.0 system using + // work on my MSVC 7.0 system using // binary_oarchive_impl::load_override; // so we use the sure-fire method below. This failed to work as well template @@ -166,7 +166,7 @@ int main( int argc, char* argv[] ) int a1[3] = {4, 5, 6}; std::stringstream ss; - { + { fast_binary_oarchive pboa(ss); pboa << a; } diff --git a/example/demo_gps.hpp b/example/demo_gps.hpp index 1830db3b..5f39cc04 100644 --- a/example/demo_gps.hpp +++ b/example/demo_gps.hpp @@ -51,7 +51,7 @@ class gps_position public: // every serializable class needs a constructor gps_position(){}; - gps_position(int _d, int _m, float _s) : + gps_position(int _d, int _m, float _s) : degrees(_d), minutes(_m), seconds(_s) {} }; @@ -209,7 +209,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br) // // Illustrates serialization of STL objects(pair) in a non-intrusive way. // See definition of operator<< >(ar, pair) -// +// // illustrates nesting of serializable classes // // illustrates use of version number to automatically grandfather older diff --git a/example/demo_pimpl.cpp b/example/demo_pimpl.cpp index 2d5446d3..629bbcd1 100644 --- a/example/demo_pimpl.cpp +++ b/example/demo_pimpl.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_pimpl.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/example/demo_pimpl_A.cpp b/example/demo_pimpl_A.cpp index 455b71ec..055d02da 100644 --- a/example/demo_pimpl_A.cpp +++ b/example/demo_pimpl_A.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_pimpl_A.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -31,15 +31,15 @@ template void A::serialize(Archive & ar, const unsigned int /* file_version */){ ar & pimpl; } - + // without the explicit instantiations below, the program will // fail to link for lack of instantiantiation of the above function // note: the following failed to fix link errors for vc 7.0 ! template void A::serialize( - boost::archive::text_iarchive & ar, + boost::archive::text_iarchive & ar, const unsigned int file_version ); template void A::serialize( - boost::archive::text_oarchive & ar, + boost::archive::text_oarchive & ar, const unsigned int file_version ); diff --git a/example/demo_pimpl_A.hpp b/example/demo_pimpl_A.hpp index 8697de8d..eff3f127 100644 --- a/example/demo_pimpl_A.hpp +++ b/example/demo_pimpl_A.hpp @@ -4,7 +4,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_pimpl_A.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/example/demo_polymorphic.cpp b/example/demo_polymorphic.cpp index 3c91745a..0a9c8566 100644 --- a/example/demo_polymorphic.cpp +++ b/example/demo_polymorphic.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_polymorphic.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -29,7 +29,7 @@ int main(int argc, char* argv[]) // instantiate archive which inhertis polymorphic interface // and the normal text archive implementation boost::archive::polymorphic_text_oarchive oa(ss); - boost::archive::polymorphic_oarchive & oa_interface = oa; + boost::archive::polymorphic_oarchive & oa_interface = oa; // we can just just the interface for saving oa_interface << a; } @@ -53,7 +53,7 @@ int main(int argc, char* argv[]) { // see above boost::archive::polymorphic_binary_iarchive ia(ss); - boost::archive::polymorphic_iarchive & ia_interface = ia; + boost::archive::polymorphic_iarchive & ia_interface = ia; // use just the polymorphic interface for loading. ia_interface >> a1; } diff --git a/example/demo_polymorphic_A.cpp b/example/demo_polymorphic_A.cpp index c32d4a13..bf26cb41 100644 --- a/example/demo_polymorphic_A.cpp +++ b/example/demo_polymorphic_A.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_polymorphic_A.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,11 +16,11 @@ // used by this demo. template void A::serialize( - boost::archive::polymorphic_iarchive &, + boost::archive::polymorphic_iarchive &, const unsigned int ); template void A::serialize( - boost::archive::polymorphic_oarchive &, + boost::archive::polymorphic_oarchive &, const unsigned int ); diff --git a/example/demo_polymorphic_A.hpp b/example/demo_polymorphic_A.hpp index 17f9758f..513b633a 100644 --- a/example/demo_polymorphic_A.hpp +++ b/example/demo_polymorphic_A.hpp @@ -4,7 +4,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // demo_polymorphic_A.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -22,7 +22,7 @@ struct A { // class a contains a pointer to a "hidden" declaration template void serialize( - Archive & ar, + Archive & ar, const unsigned int file_version ){ ar & data; diff --git a/example/demo_portable_archive.cpp b/example/demo_portable_archive.cpp index 6d9fb2be..ae329618 100644 --- a/example/demo_portable_archive.cpp +++ b/example/demo_portable_archive.cpp @@ -43,8 +43,8 @@ public: c == rhs.c && i == rhs.i && i2 == rhs.i2 - && ui == rhs.ui - && l == rhs.l + && ui == rhs.ui + && l == rhs.l && ul == rhs.ul ; } @@ -65,7 +65,7 @@ int main( int /* argc */, char* /* argv */[] ) A a1; std::stringstream ss; - { + { portable_binary_oarchive pboa(ss); pboa << a; } @@ -77,7 +77,7 @@ int main( int /* argc */, char* /* argv */[] ) return 1; ss.clear(); - { + { portable_binary_oarchive pboa(ss, endian_big); pboa << a; } @@ -89,7 +89,7 @@ int main( int /* argc */, char* /* argv */[] ) return 1; ss.clear(); - { + { portable_binary_oarchive pboa(ss, endian_big); pboa << a; } diff --git a/example/demo_shared_ptr.cpp b/example/demo_shared_ptr.cpp index fb347a7c..63410fc8 100644 --- a/example/demo_shared_ptr.cpp +++ b/example/demo_shared_ptr.cpp @@ -18,7 +18,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/example/demo_simple_log.cpp b/example/demo_simple_log.cpp index da80b5a5..b6963c5b 100644 --- a/example/demo_simple_log.cpp +++ b/example/demo_simple_log.cpp @@ -14,7 +14,7 @@ #include "simple_log_archive.hpp" int main(int argc, char *argv[]) -{ +{ // make the schedule bus_schedule schedule; diff --git a/example/demo_trivial_archive.cpp b/example/demo_trivial_archive.cpp index 21be5963..b82b1376 100644 --- a/example/demo_trivial_archive.cpp +++ b/example/demo_trivial_archive.cpp @@ -18,7 +18,7 @@ public: ////////////////////////////////////////////////////////// // public interface used by programs that use the // serialization library - typedef boost::mpl::bool_ is_saving; + typedef boost::mpl::bool_ is_saving; typedef boost::mpl::bool_ is_loading; template void register_type(){} template trivial_oarchive & operator<<(const T & t){ @@ -33,7 +33,7 @@ public: #include "demo_gps.hpp" int main(int argc, char *argv[]) -{ +{ // make the schedule bus_schedule schedule; diff --git a/example/demo_xml.cpp b/example/demo_xml.cpp index c9524aef..4c8518e9 100644 --- a/example/demo_xml.cpp +++ b/example/demo_xml.cpp @@ -15,7 +15,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -47,7 +47,7 @@ restore_schedule(bus_schedule &s, const char * filename) } int main(int argc, char *argv[]) -{ +{ // make the schedule bus_schedule original_schedule; @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) // display the complete schedule std::cout << "original schedule"; std::cout << original_schedule; - + std::string filename(boost::archive::tmpdir()); filename += "/demo.xml"; diff --git a/example/demo_xml.hpp b/example/demo_xml.hpp index 408412a1..86d6c1b4 100644 --- a/example/demo_xml.hpp +++ b/example/demo_xml.hpp @@ -51,7 +51,7 @@ class gps_position public: // every serializable class needs a constructor gps_position(){}; - gps_position(int _d, int _m, float _s) : + gps_position(int _d, int _m, float _s) : degrees(_d), minutes(_m), seconds(_s) {} }; @@ -209,7 +209,7 @@ std::ostream & operator<<(std::ostream &os, const bus_route &br) // // Illustrates serialization of STL objects(pair) in a non-intrusive way. // See definition of operator<< >(ar, pair) -// +// // illustrates nesting of serializable classes // // illustrates use of version number to automatically grandfather older diff --git a/example/demo_xml_load.cpp b/example/demo_xml_load.cpp index cd8e03c1..fcbe80bb 100644 --- a/example/demo_xml_load.cpp +++ b/example/demo_xml_load.cpp @@ -28,7 +28,7 @@ restore_schedule(bus_schedule &s, const char * filename) } int main(int argc, char *argv[]) -{ +{ // make a new schedule bus_schedule new_schedule; diff --git a/example/demo_xml_save.cpp b/example/demo_xml_save.cpp index ff03d54a..045d40ba 100644 --- a/example/demo_xml_save.cpp +++ b/example/demo_xml_save.cpp @@ -24,7 +24,7 @@ void save_schedule(const bus_schedule &s, const char * filename){ } int main(int argc, char *argv[]) -{ +{ // make the schedule bus_schedule original_schedule; @@ -76,7 +76,7 @@ int main(int argc, char *argv[]) // display the complete schedule std::cout << "original schedule"; std::cout << original_schedule; - + std::string filename(boost::archive::tmpdir()); filename += "/demo_save.xml"; diff --git a/example/fix_six.cpp b/example/fix_six.cpp index f18755f0..6526e129 100644 --- a/example/fix_six.cpp +++ b/example/fix_six.cpp @@ -17,7 +17,7 @@ int main(int argc, char *argv[]){ } std::filebuf fb; fb.open( - argv[1], + argv[1], std::ios_base::binary | std::ios_base::in | std::ios_base::out ); if(!fb.is_open()){ diff --git a/example/log_archive.cpp b/example/log_archive.cpp index 86c3631e..8b21a008 100644 --- a/example/log_archive.cpp +++ b/example/log_archive.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // log_archive.cpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/example/log_archive.hpp b/example/log_archive.hpp index 039f0b3e..0d7ffdbd 100644 --- a/example/log_archive.hpp +++ b/example/log_archive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // log_archive.hpp -// (C) Copyright 2010 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2010 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -31,7 +31,7 @@ namespace boost { // of text output which is useful for getting a formatted display of // any serializable class. Intended to be useful as a debugging aid. class log_archive : - /* protected ? */ + /* protected ? */ public boost::archive::xml_oarchive_impl { typedef boost::archive::xml_oarchive_impl base; @@ -72,7 +72,7 @@ class log_archive : public: log_archive(std::ostream & os, unsigned int flags = 0) : boost::archive::xml_oarchive_impl( - os, + os, flags | boost::archive::no_header ) {} diff --git a/example/polymorphic_portable_binary_iarchive.cpp b/example/polymorphic_portable_binary_iarchive.cpp index 7f2f23e4..2e16262b 100644 --- a/example/polymorphic_portable_binary_iarchive.cpp +++ b/example/polymorphic_portable_binary_iarchive.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_portable_binary_iarchive.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -22,8 +22,8 @@ namespace boost { namespace archive { template class binary_iarchive_impl< - polymorphic_portable_binary_iarchive, - std::istream::char_type, + polymorphic_portable_binary_iarchive, + std::istream::char_type, std::istream::traits_type >; template class detail::archive_pointer_iserializer< diff --git a/example/polymorphic_portable_binary_iarchive.hpp b/example/polymorphic_portable_binary_iarchive.hpp index 35d99072..34334c27 100644 --- a/example/polymorphic_portable_binary_iarchive.hpp +++ b/example/polymorphic_portable_binary_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_portable_binary_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/example/polymorphic_portable_binary_oarchive.cpp b/example/polymorphic_portable_binary_oarchive.cpp index f77b9021..dce90c34 100644 --- a/example/polymorphic_portable_binary_oarchive.cpp +++ b/example/polymorphic_portable_binary_oarchive.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_portable_binary_oarchive.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -23,8 +23,8 @@ namespace archive { // explicitly instantiate for this type of binary stream template class binary_oarchive_impl< - polymorphic_portable_binary_oarchive, - std::ostream::char_type, + polymorphic_portable_binary_oarchive, + std::ostream::char_type, std::ostream::traits_type >; template class detail::archive_pointer_oserializer< diff --git a/example/polymorphic_portable_binary_oarchive.hpp b/example/polymorphic_portable_binary_oarchive.hpp index 71fe42d6..f63269a0 100644 --- a/example/polymorphic_portable_binary_oarchive.hpp +++ b/example/polymorphic_portable_binary_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_portable_binary_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/example/portable_binary_archive.hpp b/example/portable_binary_archive.hpp index 4ab796fb..132eba63 100644 --- a/example/portable_binary_archive.hpp +++ b/example/portable_binary_archive.hpp @@ -1,7 +1,7 @@ #ifndef PORTABLE_BINARY_ARCHIVE_HPP #define PORTABLE_BINARY_ARCHIVE_HPP -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/example/portable_binary_iarchive.cpp b/example/portable_binary_iarchive.cpp index b4bb357d..08f3f20e 100644 --- a/example/portable_binary_iarchive.cpp +++ b/example/portable_binary_iarchive.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // portable_binary_iarchive.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -17,7 +17,7 @@ #include "portable_binary_iarchive.hpp" -void +void portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){ char size; l = 0; @@ -48,7 +48,7 @@ portable_binary_iarchive::load_impl(boost::intmax_t & l, char maxsize){ if(m_flags & endian_big) #endif reverse_bytes(size, cptr); - + if(negative) l = -l; } @@ -70,7 +70,7 @@ portable_binary_iarchive::load_override( t.t[cn.size()] = '\0'; } -void +void portable_binary_iarchive::init(unsigned int flags){ if(0 == (flags & boost::archive::no_header)){ // read signature in an archive version independent manner @@ -94,7 +94,7 @@ portable_binary_iarchive::init(unsigned int flags){ boost::archive::archive_exception::unsupported_version ) ); - + #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3205)) this->set_library_version(input_library_version); //#else @@ -123,7 +123,7 @@ namespace detail { template class basic_binary_iprimitive< portable_binary_iarchive, - std::istream::char_type, + std::istream::char_type, std::istream::traits_type > ; diff --git a/example/portable_binary_iarchive.hpp b/example/portable_binary_iarchive.hpp index 3730660c..de7f287f 100644 --- a/example/portable_binary_iarchive.hpp +++ b/example/portable_binary_iarchive.hpp @@ -14,7 +14,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // portable_binary_iarchive.hpp -// (C) Copyright 2002-7 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-7 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -34,7 +34,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // exception to be thrown if integer read from archive doesn't fit // variable being loaded -class portable_binary_iarchive_exception : +class portable_binary_iarchive_exception : public boost::archive::archive_exception { public: @@ -62,13 +62,13 @@ public: }; /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// "Portable" input binary archive. It addresses integer size and endienness so +// "Portable" input binary archive. It addresses integer size and endienness so // that binary archives can be passed across systems. Note:floating point types // not addressed here class portable_binary_iarchive : public boost::archive::basic_binary_iprimitive< portable_binary_iarchive, - std::istream::char_type, + std::istream::char_type, std::istream::traits_type >, public boost::archive::detail::common_iarchive< @@ -77,7 +77,7 @@ class portable_binary_iarchive : { typedef boost::archive::basic_binary_iprimitive< portable_binary_iarchive, - std::istream::char_type, + std::istream::char_type, std::istream::traits_type > primitive_base_t; typedef boost::archive::detail::common_iarchive< @@ -148,21 +148,21 @@ protected: void load(unsigned char & t){ this->primitive_base_t::load(t); } - typedef boost::archive::detail::common_iarchive + typedef boost::archive::detail::common_iarchive detail_common_iarchive; template void load_override(T & t){ this->detail_common_iarchive::load_override(t); } void load_override(boost::archive::class_name_type & t); - // binary files don't include the optional information + // binary files don't include the optional information void load_override(boost::archive::class_id_optional_type &){} void init(unsigned int flags); public: portable_binary_iarchive(std::istream & is, unsigned flags = 0) : primitive_base_t( - * is.rdbuf(), + * is.rdbuf(), 0 != (flags & boost::archive::no_codecvt) ), archive_base_t(flags), @@ -173,13 +173,13 @@ public: portable_binary_iarchive( std::basic_streambuf< - std::istream::char_type, + std::istream::char_type, std::istream::traits_type - > & bsb, + > & bsb, unsigned int flags ) : primitive_base_t( - bsb, + bsb, 0 != (flags & boost::archive::no_codecvt) ), archive_base_t(flags), diff --git a/example/portable_binary_oarchive.cpp b/example/portable_binary_oarchive.cpp index c4f6aca5..a5d40496 100644 --- a/example/portable_binary_oarchive.cpp +++ b/example/portable_binary_oarchive.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // portable_binary_oarchive.cpp -// (C) Copyright 2002-7 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-7 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -12,7 +12,7 @@ #include #include "portable_binary_oarchive.hpp" -void +void portable_binary_oarchive::save_impl( const boost::intmax_t l, const char maxsize @@ -56,7 +56,7 @@ portable_binary_oarchive::save_impl( this->primitive_base_t::save_binary(cptr, size); } -void +void portable_binary_oarchive::init(unsigned int flags) { if(m_flags == (endian_big | endian_little)){ boost::serialization::throw_exception( @@ -90,7 +90,7 @@ namespace detail { template class basic_binary_oprimitive< portable_binary_oarchive, - std::ostream::char_type, + std::ostream::char_type, std::ostream::traits_type > ; diff --git a/example/portable_binary_oarchive.hpp b/example/portable_binary_oarchive.hpp index 317aa1d7..5085fc3d 100644 --- a/example/portable_binary_oarchive.hpp +++ b/example/portable_binary_oarchive.hpp @@ -14,7 +14,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // portable_binary_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -33,12 +33,12 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // exception to be thrown if integer read from archive doesn't fit // variable being loaded -class portable_binary_oarchive_exception : +class portable_binary_oarchive_exception : public boost::archive::archive_exception { public: typedef enum { - invalid_flags + invalid_flags } exception_code; portable_binary_oarchive_exception(exception_code c = invalid_flags ) {} @@ -56,14 +56,14 @@ public: }; /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// "Portable" output binary archive. This is a variation of the native binary +// "Portable" output binary archive. This is a variation of the native binary // archive. it addresses integer size and endienness so that binary archives can // be passed across systems. Note:floating point types not addressed here class portable_binary_oarchive : public boost::archive::basic_binary_oprimitive< portable_binary_oarchive, - std::ostream::char_type, + std::ostream::char_type, std::ostream::traits_type >, public boost::archive::detail::common_oarchive< @@ -72,7 +72,7 @@ class portable_binary_oarchive : { typedef boost::archive::basic_binary_oprimitive< portable_binary_oarchive, - std::ostream::char_type, + std::ostream::char_type, std::ostream::traits_type > primitive_base_t; typedef boost::archive::detail::common_oarchive< @@ -128,7 +128,7 @@ protected: // default processing - kick back to base class. Note the // extra stuff to get it passed borland compilers - typedef boost::archive::detail::common_oarchive + typedef boost::archive::detail::common_oarchive detail_common_oarchive; template void save_override(T & t){ @@ -139,7 +139,7 @@ protected: const std::string s(t); * this << s; } - // binary files don't include the optional information + // binary files don't include the optional information void save_override( const boost::archive::class_id_optional_type & /* t */ ){} @@ -159,13 +159,13 @@ public: portable_binary_oarchive( std::basic_streambuf< - std::ostream::char_type, + std::ostream::char_type, std::ostream::traits_type - > & bsb, + > & bsb, unsigned int flags ) : primitive_base_t( - bsb, + bsb, 0 != (flags & boost::archive::no_codecvt) ), archive_base_t(flags), diff --git a/example/simple_log_archive.hpp b/example/simple_log_archive.hpp index e85f322f..44f6d73d 100644 --- a/example/simple_log_archive.hpp +++ b/example/simple_log_archive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // simple_log_archive.hpp -// (C) Copyright 2010 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2010 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -21,8 +21,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -65,15 +65,15 @@ class simple_log_archive { // make sure call is routed through the highest interface that might // be specialized by the user. boost::serialization::serialize_adl( - ar, - const_cast(t), + ar, + const_cast(t), ::boost::serialization::version< T >::value ); } }; template void save(const T &t){ - typedef + typedef BOOST_DEDUCED_TYPENAME boost::mpl::eval_if, boost::mpl::identity >, //else @@ -88,7 +88,7 @@ class simple_log_archive { boost::mpl::identity > > >::type typex; typex::invoke(*this, t); - } + } #ifndef BOOST_NO_STD_WSTRING void save(const std::wstring &ws){ m_os << "wide string types not suported in log archive"; @@ -110,12 +110,12 @@ public: return 0; } - void + void save_binary(const void *address, std::size_t count){ m_os << "save_binary not implemented"; } - // the << operators + // the << operators template simple_log_archive & operator<<(T const & t){ m_os << ' '; @@ -151,7 +151,7 @@ public: return * this; } - // the & operator + // the & operator template simple_log_archive & operator&(const T & t){ return * this << t; diff --git a/include/boost/archive/archive_exception.hpp b/include/boost/archive/archive_exception.hpp index fabcdb5f..e4234a78 100644 --- a/include/boost/archive/archive_exception.hpp +++ b/include/boost/archive/archive_exception.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // archive/archive_exception.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -20,16 +20,16 @@ #include #include -#include +#include #include // note: the only reason this is in here is that windows header // includes #define exception_code _exception_code (arrrgghhhh!). // the most expedient way to address this is be sure that this // header is always included whenever this header file is included. -#if defined(BOOST_WINDOWS) -#include -#endif +#if defined(BOOST_WINDOWS) +#include +#endif #include // must be the last header @@ -39,7 +39,7 @@ namespace archive { ////////////////////////////////////////////////////////////////////// // exceptions thrown by archives // -class BOOST_SYMBOL_VISIBLE archive_exception : +class BOOST_SYMBOL_VISIBLE archive_exception : public virtual std::exception { private: @@ -61,8 +61,8 @@ public: // subsequent to this one pointer_conflict, // an attempt has been made to directly // serialize an object which has - // already been serialized through a pointer. - // Were this permitted, the archive load would result + // already been serialized through a pointer. + // Were this permitted, the archive load would result // in the creation of an extra copy of the obect. incompatible_native_format, // attempt to read native binary format // on incompatible platform @@ -71,9 +71,9 @@ public: invalid_class_name, // class name greater than the maximum permitted. // most likely a corrupted archive or an attempt // to insert virus via buffer overrun method. - unregistered_cast, // base - derived relationship not registered with + unregistered_cast, // base - derived relationship not registered with // void_cast_register - unsupported_class_version, // type saved with a version # greater than the + unsupported_class_version, // type saved with a version # greater than the // one used by the program. This indicates that the program // needs to be rebuilt. multiple_code_instantiation, // code for implementing serialization for some @@ -83,7 +83,7 @@ public: exception_code code; BOOST_ARCHIVE_DECL archive_exception( - exception_code c, + exception_code c, const char * e1 = NULL, const char * e2 = NULL ) BOOST_NOEXCEPT; diff --git a/include/boost/archive/basic_archive.hpp b/include/boost/archive/basic_archive.hpp index 9283974f..b0fd69a6 100644 --- a/include/boost/archive/basic_archive.hpp +++ b/include/boost/archive/basic_archive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_archive.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -46,27 +46,27 @@ public: explicit library_version_type(const unsigned int & t_) : t(t_){ BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } - library_version_type(const library_version_type & t_) : + library_version_type(const library_version_type & t_) : t(t_.t) {} library_version_type & operator=(const library_version_type & rhs){ - t = rhs.t; + t = rhs.t; return *this; } // used for text output operator base_type () const { return t; - } + } // used for text input operator base_type & (){ return t; - } + } bool operator==(const library_version_type & rhs) const { return t == rhs.t; - } + } bool operator<(const library_version_type & rhs) const { return t < rhs.t; - } + } }; BOOST_ARCHIVE_DECL library_version_type @@ -82,27 +82,27 @@ public: explicit version_type(const unsigned int & t_) : t(t_){ BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } - version_type(const version_type & t_) : + version_type(const version_type & t_) : t(t_.t) {} version_type & operator=(const version_type & rhs){ - t = rhs.t; + t = rhs.t; return *this; } // used for text output operator base_type () const { return t; - } + } // used for text intput operator base_type & (){ return t; - } + } bool operator==(const version_type & rhs) const { return t == rhs.t; - } + } bool operator<(const version_type & rhs) const { return t < rhs.t; - } + } }; class class_id_type { @@ -118,28 +118,28 @@ public: explicit class_id_type(const std::size_t t_) : t(t_){ // BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } - class_id_type(const class_id_type & t_) : + class_id_type(const class_id_type & t_) : t(t_.t) {} class_id_type & operator=(const class_id_type & rhs){ - t = rhs.t; + t = rhs.t; return *this; } // used for text output operator base_type () const { return t; - } + } // used for text input operator base_type &() { return t; - } + } bool operator==(const class_id_type & rhs) const { return t == rhs.t; - } + } bool operator<(const class_id_type & rhs) const { return t < rhs.t; - } + } }; #define NULL_POINTER_TAG boost::archive::class_id_type(-1) @@ -157,27 +157,27 @@ public: // precision BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } - object_id_type(const object_id_type & t_) : + object_id_type(const object_id_type & t_) : t(t_.t) {} object_id_type & operator=(const object_id_type & rhs){ - t = rhs.t; + t = rhs.t; return *this; } // used for text output operator base_type () const { return t; - } + } // used for text input operator base_type & () { return t; - } + } bool operator==(const object_id_type & rhs) const { return t == rhs.t; - } + } bool operator<(const object_id_type & rhs) const { return t < rhs.t; - } + } }; #if defined(_MSC_VER) @@ -214,8 +214,8 @@ struct tracking_type { } }; -struct class_name_type : - private boost::noncopyable +struct class_name_type : + private boost::noncopyable { char *t; operator const char * & () const { @@ -227,9 +227,9 @@ struct class_name_type : std::size_t size() const { return std::strlen(t); } - explicit class_name_type(const char *key_) + explicit class_name_type(const char *key_) : t(const_cast(key_)){} - explicit class_name_type(char *key_) + explicit class_name_type(char *key_) : t(key_){} class_name_type & operator=(const class_name_type & rhs){ t = rhs.t; @@ -249,7 +249,7 @@ BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_SIGNATURE(); /* NOTE : Warning : Warning : Warning : Warning : Warning - * If any of these are changed to different sized types, + * If any of these are changed to different sized types, * binary_iarchive won't be able to read older archives * unless you rev the library version and include conditional * code based on the library version. There is nothing @@ -291,7 +291,7 @@ BOOST_CLASS_IMPLEMENTATION(boost::archive::tracking_type, primitive_type) #include -// set types used internally by the serialization library +// set types used internally by the serialization library // to be bitwise serializable BOOST_IS_BITWISE_SERIALIZABLE(boost::archive::library_version_type) diff --git a/include/boost/archive/basic_binary_iarchive.hpp b/include/boost/archive/basic_binary_iarchive.hpp index c85ead86..1d26ddc0 100644 --- a/include/boost/archive/basic_binary_iarchive.hpp +++ b/include/boost/archive/basic_binary_iarchive.hpp @@ -16,7 +16,7 @@ // IN GENERAL, ARCHIVES CREATED WITH THIS CLASS WILL NOT BE READABLE // ON PLATFORM APART FROM THE ONE THEY ARE CREATED ON -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -40,7 +40,7 @@ #include // must be the last header -namespace boost { +namespace boost { namespace archive { namespace detail { @@ -50,7 +50,7 @@ namespace detail { ///////////////////////////////////////////////////////////////////////// // class basic_binary_iarchive - read serialized objects from a input binary stream template -class BOOST_SYMBOL_VISIBLE basic_binary_iarchive : +class BOOST_SYMBOL_VISIBLE basic_binary_iarchive : public detail::common_iarchive { #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS @@ -66,7 +66,7 @@ protected: #endif #endif // intermediate level to support override of operators - // fot templates in the absence of partial function + // fot templates in the absence of partial function // template ordering. If we get here pass to base class // note extra nonsense to sneak it pass the borland compiers typedef detail::common_iarchive detail_common_iarchive; @@ -84,7 +84,7 @@ protected: BOOST_STATIC_ASSERT(sizeof(object_id_type) == sizeof(uint_least32_t)); BOOST_STATIC_ASSERT(sizeof(object_reference_type) == sizeof(uint_least32_t)); - // binary files don't include the optional information + // binary files don't include the optional information void load_override(class_id_optional_type & /* t */){} void load_override(tracking_type & t, int /*version*/){ @@ -117,7 +117,7 @@ protected: * - v > 6 : 16bit * - other : 32bit * --> which is obviously incorrect, see point 1 - * + * * the fix here decodes class_id_type on 16bit for all v <= 7, which seems to be the correct behaviour ... */ if(boost::archive::library_version_type(7) < lvt){ @@ -191,14 +191,14 @@ protected: unsigned int x=0; * this->This() >> x; t = serialization::collection_size_type(x); - } + } } BOOST_ARCHIVE_OR_WARCHIVE_DECL void load_override(class_name_type & t); BOOST_ARCHIVE_OR_WARCHIVE_DECL void init(); - + basic_binary_iarchive(unsigned int flags) : detail::common_iarchive(flags) {} diff --git a/include/boost/archive/basic_binary_iprimitive.hpp b/include/boost/archive/basic_binary_iprimitive.hpp index 665d3e81..4d49448f 100644 --- a/include/boost/archive/basic_binary_iprimitive.hpp +++ b/include/boost/archive/basic_binary_iprimitive.hpp @@ -20,7 +20,7 @@ // IN GENERAL, ARCHIVES CREATED WITH THIS CLASS WILL NOT BE READABLE // ON PLATFORM APART FROM THE ONE THEY ARE CREATED ON -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -37,8 +37,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::memcpy; +namespace std{ + using ::memcpy; using ::size_t; } // namespace std #endif @@ -58,7 +58,7 @@ namespace std{ #include #include // must be the last header -namespace boost { +namespace boost { namespace archive { ///////////////////////////////////////////////////////////////////////////// @@ -98,8 +98,8 @@ public: ///////////////////////////////////////////////////////// // fundamental types that need special treatment - - // trap usage of invalid uninitialized boolean + + // trap usage of invalid uninitialized boolean void load(bool & t){ load_binary(& t, sizeof(t)); int i = t; @@ -119,29 +119,29 @@ public: BOOST_ARCHIVE_OR_WARCHIVE_DECL void init(); - BOOST_ARCHIVE_OR_WARCHIVE_DECL + BOOST_ARCHIVE_OR_WARCHIVE_DECL basic_binary_iprimitive( - std::basic_streambuf & sb, + std::basic_streambuf & sb, bool no_codecvt ); - BOOST_ARCHIVE_OR_WARCHIVE_DECL + BOOST_ARCHIVE_OR_WARCHIVE_DECL ~basic_binary_iprimitive(); public: // we provide an optimized load for all fundamental types - // typedef serialization::is_bitwise_serializable + // typedef serialization::is_bitwise_serializable // use_array_optimization; - struct use_array_optimization { - template - #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS) - struct apply { - typedef typename boost::serialization::is_bitwise_serializable< T >::type type; + struct use_array_optimization { + template + #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS) + struct apply { + typedef typename boost::serialization::is_bitwise_serializable< T >::type type; }; #else - struct apply : public boost::serialization::is_bitwise_serializable< T > {}; + struct apply : public boost::serialization::is_bitwise_serializable< T > {}; #endif }; - // the optimized load_array dispatches to load_binary + // the optimized load_array dispatches to load_binary template void load_array(serialization::array_wrapper& a, unsigned int) { @@ -155,17 +155,17 @@ public: template inline void basic_binary_iprimitive::load_binary( - void *address, + void *address, std::size_t count ){ // note: an optimizer should eliminate the following for char files BOOST_ASSERT( - static_cast(count / sizeof(Elem)) + static_cast(count / sizeof(Elem)) <= boost::integer_traits::const_max ); std::streamsize s = static_cast(count / sizeof(Elem)); std::streamsize scount = m_sb.sgetn( - static_cast(address), + static_cast(address), s ); if(scount != s) diff --git a/include/boost/archive/basic_binary_oarchive.hpp b/include/boost/archive/basic_binary_oarchive.hpp index f05f2f86..cfd6df77 100644 --- a/include/boost/archive/basic_binary_oarchive.hpp +++ b/include/boost/archive/basic_binary_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_binary_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -58,7 +58,7 @@ namespace detail { // does have the virtue of buiding the smalles archive in the minimum amount // of time. So under some circumstances it may be he right choice. template -class BOOST_SYMBOL_VISIBLE basic_binary_oarchive : +class BOOST_SYMBOL_VISIBLE basic_binary_oarchive : public detail::common_oarchive { #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS @@ -90,7 +90,7 @@ protected: BOOST_STATIC_ASSERT(sizeof(object_id_type) == sizeof(uint_least32_t)); BOOST_STATIC_ASSERT(sizeof(object_reference_type) == sizeof(uint_least32_t)); - // binary files don't include the optional information + // binary files don't include the optional information void save_override(const class_id_optional_type & /* t */){} // enable this if we decide to support generation of previous versions @@ -159,7 +159,7 @@ protected: unsigned int x=0; * this->This() >> x; t = serialization::collection_size_type(x); - } + } else{ * this->This() >> t; } diff --git a/include/boost/archive/basic_binary_oprimitive.hpp b/include/boost/archive/basic_binary_oprimitive.hpp index 6dc770c6..a29cb45b 100644 --- a/include/boost/archive/basic_binary_oprimitive.hpp +++ b/include/boost/archive/basic_binary_oprimitive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_binary_oprimitive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,8 +32,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -93,7 +93,7 @@ public: ///////////////////////////////////////////////////////// // fundamental types that need special treatment - + // trap usage of invalid uninitialized boolean which would // otherwise crash on load. void save(const bool t){ @@ -113,32 +113,32 @@ public: BOOST_ARCHIVE_OR_WARCHIVE_DECL void init(); - - BOOST_ARCHIVE_OR_WARCHIVE_DECL + + BOOST_ARCHIVE_OR_WARCHIVE_DECL basic_binary_oprimitive( - std::basic_streambuf & sb, + std::basic_streambuf & sb, bool no_codecvt ); - BOOST_ARCHIVE_OR_WARCHIVE_DECL + BOOST_ARCHIVE_OR_WARCHIVE_DECL ~basic_binary_oprimitive(); public: // we provide an optimized save for all fundamental types - // typedef serialization::is_bitwise_serializable + // typedef serialization::is_bitwise_serializable // use_array_optimization; // workaround without using mpl lambdas struct use_array_optimization { - template - #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS) - struct apply { - typedef typename boost::serialization::is_bitwise_serializable< T >::type type; + template + #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS) + struct apply { + typedef typename boost::serialization::is_bitwise_serializable< T >::type type; }; #else - struct apply : public boost::serialization::is_bitwise_serializable< T > {}; + struct apply : public boost::serialization::is_bitwise_serializable< T > {}; #endif }; - // the optimized save_array dispatches to save_binary + // the optimized save_array dispatches to save_binary template void save_array(boost::serialization::array_wrapper const& a, unsigned int) { @@ -149,9 +149,9 @@ public: }; template -inline void +inline void basic_binary_oprimitive::save_binary( - const void *address, + const void *address, std::size_t count ){ // BOOST_ASSERT(count <= std::size_t(boost::integer_traits::const_max)); @@ -166,7 +166,7 @@ basic_binary_oprimitive::save_binary( // figure number of elements to output - round up count = ( count + sizeof(Elem) - 1) / sizeof(Elem); std::streamsize scount = m_sb.sputn( - static_cast(address), + static_cast(address), static_cast(count) ); if(count != static_cast(scount)) @@ -174,14 +174,14 @@ basic_binary_oprimitive::save_binary( archive_exception(archive_exception::output_stream_error) ); //os.write( - // static_cast(address), + // static_cast(address), // count //); //BOOST_ASSERT(os.good()); } -} //namespace boost -} //namespace archive +} //namespace boost +} //namespace archive #include // pop pragmas diff --git a/include/boost/archive/basic_text_iarchive.hpp b/include/boost/archive/basic_text_iarchive.hpp index 48a646cc..0c46c962 100644 --- a/include/boost/archive/basic_text_iarchive.hpp +++ b/include/boost/archive/basic_text_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_text_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -46,7 +46,7 @@ namespace detail { ///////////////////////////////////////////////////////////////////////// // class basic_text_iarchive - read serialized objects from a input text stream template -class BOOST_SYMBOL_VISIBLE basic_text_iarchive : +class BOOST_SYMBOL_VISIBLE basic_text_iarchive : public detail::common_iarchive { #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS @@ -62,14 +62,14 @@ protected: #endif #endif // intermediate level to support override of operators - // fot templates in the absence of partial function + // fot templates in the absence of partial function // template ordering typedef detail::common_iarchive detail_common_iarchive; template void load_override(T & t){ this->detail_common_iarchive::load_override(t); } - // text file don't include the optional information + // text file don't include the optional information void load_override(class_id_optional_type & /*t*/){} BOOST_ARCHIVE_OR_WARCHIVE_DECL void @@ -78,7 +78,7 @@ protected: BOOST_ARCHIVE_OR_WARCHIVE_DECL void init(void); - basic_text_iarchive(unsigned int flags) : + basic_text_iarchive(unsigned int flags) : detail::common_iarchive(flags) {} ~basic_text_iarchive(){} diff --git a/include/boost/archive/basic_text_iprimitive.hpp b/include/boost/archive/basic_text_iprimitive.hpp index bf936b55..606f59f5 100644 --- a/include/boost/archive/basic_text_iprimitive.hpp +++ b/include/boost/archive/basic_text_iprimitive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_text_iprimitive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -29,8 +29,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; #if ! defined(BOOST_DINKUMWARE_STDLIB) && ! defined(__SGI_STL_PORT) using ::locale; #endif @@ -121,9 +121,9 @@ protected: t = i; } #endif - BOOST_ARCHIVE_OR_WARCHIVE_DECL + BOOST_ARCHIVE_OR_WARCHIVE_DECL basic_text_iprimitive(IStream &is, bool no_codecvt); - BOOST_ARCHIVE_OR_WARCHIVE_DECL + BOOST_ARCHIVE_OR_WARCHIVE_DECL ~basic_text_iprimitive(); public: BOOST_ARCHIVE_OR_WARCHIVE_DECL void diff --git a/include/boost/archive/basic_text_oarchive.hpp b/include/boost/archive/basic_text_oarchive.hpp index 6f7f8fb1..7425508a 100644 --- a/include/boost/archive/basic_text_oarchive.hpp +++ b/include/boost/archive/basic_text_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_text_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -44,9 +44,9 @@ namespace detail { } // namespace detail ///////////////////////////////////////////////////////////////////////// -// class basic_text_oarchive +// class basic_text_oarchive template -class BOOST_SYMBOL_VISIBLE basic_text_oarchive : +class BOOST_SYMBOL_VISIBLE basic_text_oarchive : public detail::common_oarchive { #ifdef BOOST_NO_MEMBER_TEMPLATE_FRIENDS @@ -89,7 +89,7 @@ protected: this->detail_common_oarchive::save_override(t); } - // text file don't include the optional information + // text file don't include the optional information void save_override(const class_id_optional_type & /* t */){} void save_override(const class_name_type & t){ diff --git a/include/boost/archive/basic_text_oprimitive.hpp b/include/boost/archive/basic_text_oprimitive.hpp index 45f09358..dfbd6e48 100644 --- a/include/boost/archive/basic_text_oprimitive.hpp +++ b/include/boost/archive/basic_text_oprimitive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_text_oprimitive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -38,7 +38,7 @@ #endif #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::size_t; #if ! defined(BOOST_DINKUMWARE_STDLIB) && ! defined(__SGI_STL_PORT) using ::locale; @@ -142,12 +142,12 @@ protected: template struct is_float { - typedef typename mpl::bool_< - boost::is_floating_point::value + typedef typename mpl::bool_< + boost::is_floating_point::value || (std::numeric_limits::is_specialized && !std::numeric_limits::is_integer && !std::numeric_limits::is_exact - && std::numeric_limits::max_exponent) + && std::numeric_limits::max_exponent) >::type type; }; @@ -181,7 +181,7 @@ protected: BOOST_ARCHIVE_OR_WARCHIVE_DECL basic_text_oprimitive(OStream & os, bool no_codecvt); - BOOST_ARCHIVE_OR_WARCHIVE_DECL + BOOST_ARCHIVE_OR_WARCHIVE_DECL ~basic_text_oprimitive(); public: // unformatted append of one character @@ -197,12 +197,12 @@ public: while('\0' != *s) os.put(*s++); } - BOOST_ARCHIVE_OR_WARCHIVE_DECL void + BOOST_ARCHIVE_OR_WARCHIVE_DECL void save_binary(const void *address, std::size_t count); }; -} //namespace boost -} //namespace archive +} //namespace boost +} //namespace archive #include // pops abi_suffix.hpp pragmas diff --git a/include/boost/archive/basic_xml_archive.hpp b/include/boost/archive/basic_xml_archive.hpp index bef368b9..546610fa 100644 --- a/include/boost/archive/basic_xml_archive.hpp +++ b/include/boost/archive/basic_xml_archive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_xml_archive.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -21,40 +21,40 @@ #include #include // must be the last header -namespace boost { +namespace boost { namespace archive { // constant strings used in xml i/o -extern +extern BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_XML_OBJECT_ID(); -extern +extern BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_XML_OBJECT_REFERENCE(); -extern +extern BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_XML_CLASS_ID(); -extern +extern BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_XML_CLASS_ID_REFERENCE(); -extern +extern BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_XML_CLASS_NAME(); -extern +extern BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_XML_TRACKING(); -extern +extern BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_XML_VERSION(); -extern +extern BOOST_ARCHIVE_DECL const char * BOOST_ARCHIVE_XML_SIGNATURE(); diff --git a/include/boost/archive/binary_iarchive.hpp b/include/boost/archive/binary_iarchive.hpp index 785ce761..cacfbb78 100644 --- a/include/boost/archive/binary_iarchive.hpp +++ b/include/boost/archive/binary_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -33,8 +33,8 @@ namespace archive { // preserve correct static polymorphism. class BOOST_SYMBOL_VISIBLE binary_iarchive : public binary_iarchive_impl< - boost::archive::binary_iarchive, - std::istream::char_type, + boost::archive::binary_iarchive, + std::istream::char_type, std::istream::traits_type >{ public: diff --git a/include/boost/archive/binary_iarchive_impl.hpp b/include/boost/archive/binary_iarchive_impl.hpp index b4747c98..e4b42a8d 100644 --- a/include/boost/archive/binary_iarchive_impl.hpp +++ b/include/boost/archive/binary_iarchive_impl.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_iarchive_impl.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { namespace detail { @@ -33,7 +33,7 @@ namespace detail { } // namespace detail template -class BOOST_SYMBOL_VISIBLE binary_iarchive_impl : +class BOOST_SYMBOL_VISIBLE binary_iarchive_impl : public basic_binary_iprimitive, public basic_binary_iarchive { @@ -70,11 +70,11 @@ protected: #endif } binary_iarchive_impl( - std::basic_streambuf & bsb, + std::basic_streambuf & bsb, unsigned int flags ) : basic_binary_iprimitive( - bsb, + bsb, 0 != (flags & no_codecvt) ), basic_binary_iarchive(flags) @@ -82,11 +82,11 @@ protected: init(flags); } binary_iarchive_impl( - std::basic_istream & is, + std::basic_istream & is, unsigned int flags ) : basic_binary_iprimitive( - * is.rdbuf(), + * is.rdbuf(), 0 != (flags & no_codecvt) ), basic_binary_iarchive(flags) diff --git a/include/boost/archive/binary_oarchive.hpp b/include/boost/archive/binary_oarchive.hpp index e8313fd7..3dff31dd 100644 --- a/include/boost/archive/binary_oarchive.hpp +++ b/include/boost/archive/binary_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -26,13 +26,13 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { // do not derive from this class. If you want to extend this functionality // via inhertance, derived from binary_oarchive_impl instead. This will // preserve correct static polymorphism. -class BOOST_SYMBOL_VISIBLE binary_oarchive : +class BOOST_SYMBOL_VISIBLE binary_oarchive : public binary_oarchive_impl< binary_oarchive, std::ostream::char_type, std::ostream::traits_type > diff --git a/include/boost/archive/binary_oarchive_impl.hpp b/include/boost/archive/binary_oarchive_impl.hpp index 6b4d018a..afcc88ed 100644 --- a/include/boost/archive/binary_oarchive_impl.hpp +++ b/include/boost/archive/binary_oarchive_impl.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_oarchive_impl.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -26,7 +26,7 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { namespace detail { @@ -34,7 +34,7 @@ namespace detail { } // namespace detail template -class BOOST_SYMBOL_VISIBLE binary_oarchive_impl : +class BOOST_SYMBOL_VISIBLE binary_oarchive_impl : public basic_binary_oprimitive, public basic_binary_oarchive { @@ -71,11 +71,11 @@ protected: #endif } binary_oarchive_impl( - std::basic_streambuf & bsb, + std::basic_streambuf & bsb, unsigned int flags ) : basic_binary_oprimitive( - bsb, + bsb, 0 != (flags & no_codecvt) ), basic_binary_oarchive(flags) @@ -83,11 +83,11 @@ protected: init(flags); } binary_oarchive_impl( - std::basic_ostream & os, + std::basic_ostream & os, unsigned int flags ) : basic_binary_oprimitive( - * os.rdbuf(), + * os.rdbuf(), 0 != (flags & no_codecvt) ), basic_binary_oarchive(flags) diff --git a/include/boost/archive/binary_wiarchive.hpp b/include/boost/archive/binary_wiarchive.hpp index 775d8f82..45a2af56 100644 --- a/include/boost/archive/binary_wiarchive.hpp +++ b/include/boost/archive/binary_wiarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_wiarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,10 +25,10 @@ #include #include -namespace boost { +namespace boost { namespace archive { -class binary_wiarchive : +class binary_wiarchive : public binary_iarchive_impl< binary_wiarchive, std::wistream::char_type, std::wistream::traits_type > diff --git a/include/boost/archive/binary_woarchive.hpp b/include/boost/archive/binary_woarchive.hpp index a8817d6f..6735ceba 100644 --- a/include/boost/archive/binary_woarchive.hpp +++ b/include/boost/archive/binary_woarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_woarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,13 +25,13 @@ #include #include -namespace boost { +namespace boost { namespace archive { // do not derive from this class. If you want to extend this functionality // via inhertance, derived from binary_oarchive_impl instead. This will // preserve correct static polymorphism. -class binary_woarchive : +class binary_woarchive : public binary_oarchive_impl< binary_woarchive, std::wostream::char_type, std::wostream::traits_type > diff --git a/include/boost/archive/detail/abi_prefix.hpp b/include/boost/archive/detail/abi_prefix.hpp index debf79e9..b45253b5 100644 --- a/include/boost/archive/detail/abi_prefix.hpp +++ b/include/boost/archive/detail/abi_prefix.hpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // abi_prefix.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/archive/detail/abi_suffix.hpp b/include/boost/archive/detail/abi_suffix.hpp index 4e054d66..f3307c92 100644 --- a/include/boost/archive/detail/abi_suffix.hpp +++ b/include/boost/archive/detail/abi_suffix.hpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // abi_suffix.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/archive/detail/archive_serializer_map.hpp b/include/boost/archive/detail/archive_serializer_map.hpp index 5432bfc7..1e94e258 100644 --- a/include/boost/archive/detail/archive_serializer_map.hpp +++ b/include/boost/archive/detail/archive_serializer_map.hpp @@ -7,10 +7,10 @@ #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// archive_serializer_map.hpp: extenstion of type_info required for +// archive_serializer_map.hpp: extenstion of type_info required for // serialization. -// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -18,7 +18,7 @@ // See http://www.boost.org for updates, documentation, and revision history. // note: this is nothing more than the thinest of wrappers around -// basic_serializer_map so we can have a one map / archive type. +// basic_serializer_map so we can have a one map / archive type. #include #include diff --git a/include/boost/archive/detail/auto_link_archive.hpp b/include/boost/archive/detail/auto_link_archive.hpp index 79b0e490..fefd3ab2 100644 --- a/include/boost/archive/detail/auto_link_archive.hpp +++ b/include/boost/archive/detail/auto_link_archive.hpp @@ -16,12 +16,12 @@ // See library home page at http://www.boost.org/libs/serialization -//----------------------------------------------------------------------------// +//----------------------------------------------------------------------------// // This header implements separate compilation features as described in // http://www.boost.org/more/separate_compilation.html -// enable automatic library variant selection ------------------------------// +// enable automatic library variant selection ------------------------------// #include diff --git a/include/boost/archive/detail/auto_link_warchive.hpp b/include/boost/archive/detail/auto_link_warchive.hpp index 683d191c..4f506864 100644 --- a/include/boost/archive/detail/auto_link_warchive.hpp +++ b/include/boost/archive/detail/auto_link_warchive.hpp @@ -16,12 +16,12 @@ // See library home page at http://www.boost.org/libs/serialization -//----------------------------------------------------------------------------// +//----------------------------------------------------------------------------// // This header implements separate compilation features as described in // http://www.boost.org/more/separate_compilation.html -// enable automatic library variant selection ------------------------------// +// enable automatic library variant selection ------------------------------// #include diff --git a/include/boost/archive/detail/basic_iarchive.hpp b/include/boost/archive/detail/basic_iarchive.hpp index 1f5a8bf6..7e0e23f5 100644 --- a/include/boost/archive/detail/basic_iarchive.hpp +++ b/include/boost/archive/detail/basic_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_iarchive.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -72,27 +72,27 @@ public: const basic_iserializer & bis ); BOOST_ARCHIVE_DECL void load_object( - void *t, + void *t, const basic_iserializer & bis ); - BOOST_ARCHIVE_DECL const basic_pointer_iserializer * + BOOST_ARCHIVE_DECL const basic_pointer_iserializer * load_pointer( - void * & t, + void * & t, const basic_pointer_iserializer * bpis_ptr, const basic_pointer_iserializer * (*finder)( const boost::serialization::extended_type_info & eti ) ); // real public API starts here - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void set_library_version(library_version_type archive_library_version); - BOOST_ARCHIVE_DECL library_version_type + BOOST_ARCHIVE_DECL library_version_type get_library_version() const; BOOST_ARCHIVE_DECL unsigned int get_flags() const; - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void reset_object_address(const void * new_address, const void * old_address); - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void delete_created_pointers(); }; diff --git a/include/boost/archive/detail/basic_iserializer.hpp b/include/boost/archive/detail/basic_iserializer.hpp index 0d66674c..98c9c474 100644 --- a/include/boost/archive/detail/basic_iserializer.hpp +++ b/include/boost/archive/detail/basic_iserializer.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_iserializer.hpp: extenstion of type_info required for serialization. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -42,7 +42,7 @@ namespace detail { class basic_iarchive; class basic_pointer_iserializer; -class BOOST_SYMBOL_VISIBLE basic_iserializer : +class BOOST_SYMBOL_VISIBLE basic_iserializer : public basic_serializer { private: @@ -63,7 +63,7 @@ public: return m_bpis; } virtual void load_object_data( - basic_iarchive & ar, + basic_iarchive & ar, void *x, const unsigned int file_version ) const = 0; diff --git a/include/boost/archive/detail/basic_oarchive.hpp b/include/boost/archive/detail/basic_oarchive.hpp index c379108d..61e9fbdc 100644 --- a/include/boost/archive/detail/basic_oarchive.hpp +++ b/include/boost/archive/detail/basic_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_oarchive.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -69,11 +69,11 @@ public: const basic_oserializer & bos ); BOOST_ARCHIVE_DECL void save_object( - const void *x, + const void *x, const basic_oserializer & bos ); BOOST_ARCHIVE_DECL void save_pointer( - const void * t, + const void * t, const basic_pointer_oserializer * bpos_ptr ); void save_null_pointer(){ diff --git a/include/boost/archive/detail/basic_oserializer.hpp b/include/boost/archive/detail/basic_oserializer.hpp index 94247e90..b3f95677 100644 --- a/include/boost/archive/detail/basic_oserializer.hpp +++ b/include/boost/archive/detail/basic_oserializer.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_oserializer.hpp: extenstion of type_info required for serialization. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/archive/detail/basic_pointer_iserializer.hpp b/include/boost/archive/detail/basic_pointer_iserializer.hpp index 1fc4b14d..be805a42 100644 --- a/include/boost/archive/detail/basic_pointer_iserializer.hpp +++ b/include/boost/archive/detail/basic_pointer_iserializer.hpp @@ -7,10 +7,10 @@ #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// basic_pointer_oserializer.hpp: extenstion of type_info required for +// basic_pointer_oserializer.hpp: extenstion of type_info required for // serialization. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -51,7 +51,7 @@ public: virtual void * heap_allocation() const = 0; virtual const basic_iserializer & get_basic_serializer() const = 0; virtual void load_object_ptr( - basic_iarchive & ar, + basic_iarchive & ar, void * x, const unsigned int file_version ) const = 0; diff --git a/include/boost/archive/detail/basic_pointer_oserializer.hpp b/include/boost/archive/detail/basic_pointer_oserializer.hpp index 1a5d9549..86376568 100644 --- a/include/boost/archive/detail/basic_pointer_oserializer.hpp +++ b/include/boost/archive/detail/basic_pointer_oserializer.hpp @@ -7,10 +7,10 @@ #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// basic_pointer_oserializer.hpp: extenstion of type_info required for +// basic_pointer_oserializer.hpp: extenstion of type_info required for // serialization. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -39,7 +39,7 @@ namespace detail { class basic_oarchive; class basic_oserializer; -class BOOST_SYMBOL_VISIBLE basic_pointer_oserializer : +class BOOST_SYMBOL_VISIBLE basic_pointer_oserializer : public basic_serializer { protected: diff --git a/include/boost/archive/detail/basic_serializer.hpp b/include/boost/archive/detail/basic_serializer.hpp index f9c4203f..9c2535bf 100644 --- a/include/boost/archive/detail/basic_serializer.hpp +++ b/include/boost/archive/detail/basic_serializer.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_serializer.hpp: extenstion of type_info required for serialization. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,18 +32,18 @@ namespace boost { namespace archive { namespace detail { -class basic_serializer : +class basic_serializer : private boost::noncopyable { const boost::serialization::extended_type_info * m_eti; protected: explicit basic_serializer( const boost::serialization::extended_type_info & eti - ) : + ) : m_eti(& eti) {} public: - inline bool + inline bool operator<(const basic_serializer & rhs) const { // can't compare address since there can be multiple eti records // for the same type in different execution modules (that is, DLLS) diff --git a/include/boost/archive/detail/basic_serializer_map.hpp b/include/boost/archive/detail/basic_serializer_map.hpp index 79341803..78c6a52d 100644 --- a/include/boost/archive/detail/basic_serializer_map.hpp +++ b/include/boost/archive/detail/basic_serializer_map.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_serializer_map.hpp: extenstion of type_info required for serialization. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -24,7 +24,7 @@ #include // must be the last header -namespace boost { +namespace boost { namespace serialization { class extended_type_info; } @@ -45,7 +45,7 @@ basic_serializer_map : public ) const ; }; typedef std::set< - const basic_serializer *, + const basic_serializer *, type_info_pointer_compare > map_type; map_type m_map; diff --git a/include/boost/archive/detail/check.hpp b/include/boost/archive/detail/check.hpp index 10034e7d..15a2c31e 100644 --- a/include/boost/archive/detail/check.hpp +++ b/include/boost/archive/detail/check.hpp @@ -15,7 +15,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // check.hpp: interface for serialization system. -// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -49,7 +49,7 @@ namespace detail { template inline void check_object_level(){ - typedef + typedef typename mpl::greater_equal< serialization::implementation_level< T >, mpl::int_ @@ -62,7 +62,7 @@ inline void check_object_level(){ template inline void check_object_versioning(){ - typedef + typedef typename mpl::or_< typename mpl::greater< serialization::implementation_level< T >, @@ -90,8 +90,8 @@ inline void check_object_tracking(){ // saving an non-const object of a type not marked "track_never) // may be an indicator of an error usage of the - // serialization library and should be double checked. - // See documentation on object tracking. Also, see the + // serialization library and should be double checked. + // See documentation on object tracking. Also, see the // "rationale" section of the documenation // for motivation for this checking. @@ -104,7 +104,7 @@ template inline void check_pointer_level(){ // we should only invoke this once we KNOW that T // has been used as a pointer!! - typedef + typedef typename mpl::or_< typename mpl::greater< serialization::implementation_level< T >, @@ -126,12 +126,12 @@ inline void check_pointer_level(){ // in this case, indication that an object is tracked is // not stored in the archive itself - see level == object_serializable - // but rather the existence of the operation ar >> T * is used to + // but rather the existence of the operation ar >> T * is used to // infer that an object of this type should be tracked. So, if // you save via a pointer but don't load via a pointer the operation // will fail on load without given any valid reason for the failure. - // So if your program traps here, consider changing the + // So if your program traps here, consider changing the // tracking or implementation level traits - or not // serializing via a pointer. BOOST_STATIC_WARNING(typex::value); diff --git a/include/boost/archive/detail/common_iarchive.hpp b/include/boost/archive/detail/common_iarchive.hpp index 4176a8a5..c79bc323 100644 --- a/include/boost/archive/detail/common_iarchive.hpp +++ b/include/boost/archive/detail/common_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // common_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -43,7 +43,7 @@ class BOOST_SYMBOL_VISIBLE common_iarchive : friend class basic_iarchive; private: virtual void vload(version_type & t){ - * this->This() >> t; + * this->This() >> t; } virtual void vload(object_id_type & t){ * this->This() >> t; @@ -71,7 +71,7 @@ protected: void load_start(const char * /*name*/){} void load_end(const char * /*name*/){} // default archive initialization - common_iarchive(unsigned int flags = 0) : + common_iarchive(unsigned int flags = 0) : basic_iarchive(flags), interface_iarchive() {} diff --git a/include/boost/archive/detail/common_oarchive.hpp b/include/boost/archive/detail/common_oarchive.hpp index f7428637..61f7367d 100644 --- a/include/boost/archive/detail/common_oarchive.hpp +++ b/include/boost/archive/detail/common_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // common_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -72,7 +72,7 @@ protected: } void save_start(const char * /*name*/){} void save_end(const char * /*name*/){} - common_oarchive(unsigned int flags = 0) : + common_oarchive(unsigned int flags = 0) : basic_oarchive(flags), interface_oarchive() {} diff --git a/include/boost/archive/detail/decl.hpp b/include/boost/archive/detail/decl.hpp index 4f731cde..70555c31 100644 --- a/include/boost/archive/detail/decl.hpp +++ b/include/boost/archive/detail/decl.hpp @@ -1,10 +1,10 @@ #ifndef BOOST_ARCHIVE_DETAIL_DECL_HPP -#define BOOST_ARCHIVE_DETAIL_DECL_HPP +#define BOOST_ARCHIVE_DETAIL_DECL_HPP // MS compatible compilers support #pragma once #if defined(_MSC_VER) # pragma once -#endif +#endif /////////1/////////2///////// 3/////////4/////////5/////////6/////////7/////////8 // decl.hpp @@ -16,7 +16,7 @@ // See library home page at http://www.boost.org/libs/serialization -//----------------------------------------------------------------------------// +//----------------------------------------------------------------------------// // This header implements separate compilation features as described in // http://www.boost.org/more/separate_compilation.html diff --git a/include/boost/archive/detail/interface_iarchive.hpp b/include/boost/archive/detail/interface_iarchive.hpp index 4a99e28b..a9274afc 100644 --- a/include/boost/archive/detail/interface_iarchive.hpp +++ b/include/boost/archive/detail/interface_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // interface_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -31,7 +31,7 @@ namespace detail { class basic_pointer_iserializer; template -class interface_iarchive +class interface_iarchive { protected: interface_iarchive(){}; @@ -47,11 +47,11 @@ public: } template - const basic_pointer_iserializer * + const basic_pointer_iserializer * register_type(T * = NULL){ const basic_pointer_iserializer & bpis = boost::serialization::singleton< - pointer_iserializer + pointer_iserializer >::get_const_instance(); this->This()->register_basic_serializer(bpis.get_basic_serializer()); return & bpis; @@ -62,14 +62,14 @@ public: helper_collection & hc = this->This()->get_helper_collection(); return hc.template find_helper(id); } - + template Archive & operator>>(T & t){ this->This()->load_override(t); return * this->This(); } - // the & operator + // the & operator template Archive & operator&(T & t){ return *(this->This()) >> t; diff --git a/include/boost/archive/detail/interface_oarchive.hpp b/include/boost/archive/detail/interface_oarchive.hpp index 359463ed..7ecedeb3 100644 --- a/include/boost/archive/detail/interface_oarchive.hpp +++ b/include/boost/archive/detail/interface_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // interface_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,7 +32,7 @@ namespace detail { class basic_pointer_oserializer; template -class interface_oarchive +class interface_oarchive { protected: interface_oarchive(){}; @@ -48,7 +48,7 @@ public: } template - const basic_pointer_oserializer * + const basic_pointer_oserializer * register_type(const T * = NULL){ const basic_pointer_oserializer & bpos = boost::serialization::singleton< @@ -57,7 +57,7 @@ public: this->This()->register_basic_serializer(bpos.get_basic_serializer()); return & bpos; } - + template Helper & get_helper(void * const id = 0){ @@ -70,8 +70,8 @@ public: this->This()->save_override(t); return * this->This(); } - - // the & operator + + // the & operator template Archive & operator&(const T & t){ return * this ->This() << t; diff --git a/include/boost/archive/detail/iserializer.hpp b/include/boost/archive/detail/iserializer.hpp index 98cd6a17..33d8d90e 100644 --- a/include/boost/archive/detail/iserializer.hpp +++ b/include/boost/archive/detail/iserializer.hpp @@ -15,7 +15,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // iserializer.hpp: interface for serialization system. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -28,8 +28,8 @@ #include #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -41,8 +41,8 @@ namespace std{ #include #include -#ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO - #include +#ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO + #include #endif #include #include @@ -127,24 +127,24 @@ public: explicit iserializer() : basic_iserializer( boost::serialization::singleton< - typename + typename boost::serialization::type_info_implementation< T >::type >::get_const_instance() ) {} virtual BOOST_DLLEXPORT void load_object_data( basic_iarchive & ar, - void *x, + void *x, const unsigned int file_version ) const BOOST_USED; virtual bool class_info() const { - return boost::serialization::implementation_level< T >::value + return boost::serialization::implementation_level< T >::value >= boost::serialization::object_class_info; } virtual bool tracking(const unsigned int /* flags */) const { - return boost::serialization::tracking_level< T >::value + return boost::serialization::tracking_level< T >::value == boost::serialization::track_always - || ( boost::serialization::tracking_level< T >::value + || ( boost::serialization::tracking_level< T >::value == boost::serialization::track_selectively && serialized_as_pointer()); } @@ -164,12 +164,12 @@ public: template BOOST_DLLEXPORT void iserializer::load_object_data( basic_iarchive & ar, - void *x, + void *x, const unsigned int file_version ) const { // note: we now comment this out. Before we permited archive // version # to be very large. Now we don't. To permit - // readers of these old archives, we have to suppress this + // readers of these old archives, we have to suppress this // code. Perhaps in the future we might re-enable it but // permit its suppression with a runtime switch. #if 0 @@ -186,7 +186,7 @@ BOOST_DLLEXPORT void iserializer::load_object_data( // be specialized by the user. boost::serialization::serialize_adl( boost::serialization::smart_cast_reference(ar), - * static_cast(x), + * static_cast(x), file_version ); } @@ -199,7 +199,7 @@ BOOST_DLLEXPORT void iserializer::load_object_data( // the purpose of this code is to allocate memory for an object // without requiring the constructor to be called. Presumably // the allocated object will be subsequently initialized with -// "placement new". +// "placement new". // note: we have the boost type trait has_new_operator but we // have no corresponding has_delete_operator. So we presume // that the former being true would imply that the a delete @@ -250,7 +250,7 @@ struct heap_allocation { mpl::eval_if< boost::has_new_operator< T >, mpl::identity, - mpl::identity + mpl::identity >::type typex; return typex::invoke_new(); } @@ -259,7 +259,7 @@ struct heap_allocation { mpl::eval_if< boost::has_new_operator< T >, mpl::identity, - mpl::identity + mpl::identity >::type typex; typex::invoke_delete(t); } @@ -301,7 +301,7 @@ private: >::get_const_instance(); } BOOST_DLLEXPORT virtual void load_object_ptr( - basic_iarchive & ar, + basic_iarchive & ar, void * x, const unsigned int file_version ) const BOOST_USED; @@ -319,12 +319,12 @@ public: // serialized only through base class won't get optimized out template BOOST_DLLEXPORT void pointer_iserializer::load_object_ptr( - basic_iarchive & ar, + basic_iarchive & ar, void * t, const unsigned int file_version ) const { - Archive & ar_impl = + Archive & ar_impl = boost::serialization::smart_cast_reference(ar); // note that the above will throw std::bad_alloc if the allocation @@ -334,7 +334,7 @@ BOOST_DLLEXPORT void pointer_iserializer::load_object_ptr( // automatically delete the t which is most likely not fully // constructed BOOST_TRY { - // this addresses an obscure situation that occurs when + // this addresses an obscure situation that occurs when // load_constructor de-serializes something through a pointer. ar.next_object_pointer(t); boost::serialization::load_construct_data_adl( @@ -358,7 +358,7 @@ template pointer_iserializer::pointer_iserializer() : basic_pointer_iserializer( boost::serialization::singleton< - typename + typename boost::serialization::type_info_implementation< T >::type >::get_const_instance() ) @@ -393,8 +393,8 @@ struct load_non_pointer_type { // make sure call is routed through the higest interface that might // be specialized by the user. boost::serialization::serialize_adl( - ar, - const_cast(t), + ar, + const_cast(t), boost::serialization::version< T >::value ); } @@ -407,7 +407,7 @@ struct load_non_pointer_type { static void invoke(Archive &ar, const T & t){ void * x = boost::addressof(const_cast(t)); ar.load_object( - x, + x, boost::serialization::singleton< iserializer >::get_const_instance() @@ -484,7 +484,7 @@ struct load_pointer_type { template static const basic_pointer_iserializer * register_type(Archive &ar, const T* const /*t*/){ - // there should never be any need to load an abstract polymorphic + // there should never be any need to load an abstract polymorphic // class pointer. Inhibiting code generation for this // permits abstract base classes to be used - note: exception // virtual serialize functions used for plug-ins @@ -492,7 +492,7 @@ struct load_pointer_type { mpl::eval_if< boost::serialization::is_abstract, boost::mpl::identity, - boost::mpl::identity + boost::mpl::identity >::type typex; return typex::template register_type< T >(ar); } @@ -508,7 +508,7 @@ struct load_pointer_type { boost::serialization::void_upcast( eti, boost::serialization::singleton< - typename + typename boost::serialization::type_info_implementation< T >::type >::get_const_instance(), t @@ -570,13 +570,13 @@ struct load_array_type { template static void invoke(Archive &ar, T &t){ typedef typename remove_extent< T >::type value_type; - + // convert integers to correct enum to load // determine number of elements in the array. Consider the // fact that some machines will align elements on boundries // other than characters. std::size_t current_count = sizeof(t) / ( - static_cast(static_cast(&t[1])) + static_cast(static_cast(&t[1])) - static_cast(static_cast(&t[0])) ); boost::serialization::collection_size_type count; diff --git a/include/boost/archive/detail/oserializer.hpp b/include/boost/archive/detail/oserializer.hpp index 612e1f2c..17120be7 100644 --- a/include/boost/archive/detail/oserializer.hpp +++ b/include/boost/archive/detail/oserializer.hpp @@ -15,7 +15,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // oserializer.hpp: interface for serialization system. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -36,8 +36,8 @@ #include #include -#ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO - #include +#ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO + #include #endif #include #include @@ -105,23 +105,23 @@ template class oserializer : public basic_oserializer { private: - // private constructor to inhibit any existence other than the + // private constructor to inhibit any existence other than the // static one public: explicit BOOST_DLLEXPORT oserializer() : basic_oserializer( boost::serialization::singleton< - typename + typename boost::serialization::type_info_implementation< T >::type >::get_const_instance() ) {} virtual BOOST_DLLEXPORT void save_object_data( - basic_oarchive & ar, + basic_oarchive & ar, const void *x ) const BOOST_USED; virtual bool class_info() const { - return boost::serialization::implementation_level< T >::value + return boost::serialization::implementation_level< T >::value >= boost::serialization::object_class_info; } virtual bool tracking(const unsigned int /* flags */) const { @@ -144,7 +144,7 @@ public: template BOOST_DLLEXPORT void oserializer::save_object_data( - basic_oarchive & ar, + basic_oarchive & ar, const void *x ) const { // make sure call is routed through the highest interface that might @@ -167,7 +167,7 @@ class pointer_oserializer : public basic_pointer_oserializer { private: - const basic_oserializer & + const basic_oserializer & get_basic_serializer() const { return boost::serialization::singleton< oserializer @@ -196,11 +196,11 @@ BOOST_DLLEXPORT void pointer_oserializer::save_object_ptr( // be specialized by the user. T * t = static_cast(const_cast(x)); const unsigned int file_version = boost::serialization::version< T >::value; - Archive & ar_impl + Archive & ar_impl = boost::serialization::smart_cast_reference(ar); boost::serialization::save_construct_data_adl( - ar_impl, - t, + ar_impl, + t, file_version ); ar_impl << boost::serialization::make_nvp(NULL, * t); @@ -210,14 +210,14 @@ template pointer_oserializer::pointer_oserializer() : basic_pointer_oserializer( boost::serialization::singleton< - typename + typename boost::serialization::type_info_implementation< T >::type >::get_const_instance() ) { // make sure appropriate member function is instantiated boost::serialization::singleton< - oserializer + oserializer >::get_mutable_instance().set_bpos(this); archive_serializer_map::insert(this); } @@ -244,8 +244,8 @@ struct save_non_pointer_type { // make sure call is routed through the highest interface that might // be specialized by the user. boost::serialization::serialize_adl( - ar, - const_cast(t), + ar, + const_cast(t), ::boost::serialization::version< T >::value ); } @@ -281,7 +281,7 @@ struct save_non_pointer_type { template static void invoke(Archive & ar, const T & t){ - typedef + typedef typename mpl::eval_if< // if its primitive mpl::equal_to< @@ -310,7 +310,7 @@ struct save_non_pointer_type { // else // do a fast save only tracking is turned off mpl::identity - > > >::type typex; + > > >::type typex; check_object_versioning< T >(); typex::invoke(ar, t); } @@ -344,15 +344,15 @@ struct save_pointer_type { template static const basic_pointer_oserializer * register_type(Archive &ar, T* const /*t*/){ - // there should never be any need to save an abstract polymorphic + // there should never be any need to save an abstract polymorphic // class pointer. Inhibiting code generation for this // permits abstract base classes to be used - note: exception // virtual serialize functions used for plug-ins - typedef + typedef typename mpl::eval_if< boost::serialization::is_abstract< T >, mpl::identity, - mpl::identity + mpl::identity >::type typex; return typex::template register_type< T >(ar); } @@ -361,10 +361,10 @@ struct save_pointer_type { { template static void save( - Archive &ar, + Archive &ar, T & t ){ - const basic_pointer_oserializer & bpos = + const basic_pointer_oserializer & bpos = boost::serialization::singleton< pointer_oserializer >::get_const_instance(); @@ -377,13 +377,13 @@ struct save_pointer_type { { template static void save( - Archive &ar, + Archive &ar, T & t ){ - typename + typename boost::serialization::type_info_implementation< T >::type const & i = boost::serialization::singleton< - typename + typename boost::serialization::type_info_implementation< T >::type >::get_const_instance(); @@ -417,8 +417,8 @@ struct save_pointer_type { // convert pointer to more derived type. if this is thrown // it means that the base/derived relationship hasn't be registered vp = serialization::void_downcast( - *true_type, - *this_type, + *true_type, + *this_type, static_cast(&t) ); if(NULL == vp){ @@ -431,7 +431,7 @@ struct save_pointer_type { ); } - // since true_type is valid, and this only gets made if the + // since true_type is valid, and this only gets made if the // pointer oserializer object has been created, this should never // fail const basic_pointer_oserializer * bpos @@ -454,7 +454,7 @@ struct save_pointer_type { template static void save( - Archive & ar, + Archive & ar, const T & t ){ check_pointer_level< T >(); @@ -471,7 +471,7 @@ struct save_pointer_type { static void invoke(Archive &ar, const TPtr t){ register_type(ar, t); if(NULL == t){ - basic_oarchive & boa + basic_oarchive & boa = boost::serialization::smart_cast_reference(ar); boa.save_null_pointer(); save_access::end_preamble(ar); @@ -498,11 +498,11 @@ struct save_array_type template static void invoke(Archive &ar, const T &t){ typedef typename boost::remove_extent< T >::type value_type; - + save_access::end_preamble(ar); // consider alignment std::size_t c = sizeof(t) / ( - static_cast(static_cast(&t[1])) + static_cast(static_cast(&t[1])) - static_cast(static_cast(&t[0])) ); boost::serialization::collection_size_type count(c); @@ -522,7 +522,7 @@ struct save_array_type template inline void save(Archive & ar, /*const*/ T &t){ - typedef + typedef typename mpl::eval_if, mpl::identity >, //else diff --git a/include/boost/archive/detail/polymorphic_iarchive_route.hpp b/include/boost/archive/detail/polymorphic_iarchive_route.hpp index 105685eb..df7cf2fe 100644 --- a/include/boost/archive/detail/polymorphic_iarchive_route.hpp +++ b/include/boost/archive/detail/polymorphic_iarchive_route.hpp @@ -190,7 +190,7 @@ public: } // register type function template - const basic_pointer_iserializer * + const basic_pointer_iserializer * register_type(T * t = NULL){ return ArchiveImplementation::register_type(t); } diff --git a/include/boost/archive/detail/polymorphic_oarchive_route.hpp b/include/boost/archive/detail/polymorphic_oarchive_route.hpp index b23fd6bf..eea20e62 100644 --- a/include/boost/archive/detail/polymorphic_oarchive_route.hpp +++ b/include/boost/archive/detail/polymorphic_oarchive_route.hpp @@ -181,7 +181,7 @@ public: } // register type function template - const basic_pointer_oserializer * + const basic_pointer_oserializer * register_type(T * t = NULL){ return ArchiveImplementation::register_type(t); } diff --git a/include/boost/archive/detail/register_archive.hpp b/include/boost/archive/detail/register_archive.hpp index 5ffecc70..ebc24c05 100644 --- a/include/boost/archive/detail/register_archive.hpp +++ b/include/boost/archive/detail/register_archive.hpp @@ -4,7 +4,7 @@ #ifndef BOOST_ARCHIVE_DETAIL_REGISTER_ARCHIVE_DWA2006521_HPP # define BOOST_ARCHIVE_DETAIL_REGISTER_ARCHIVE_DWA2006521_HPP -namespace boost { namespace archive { namespace detail { +namespace boost { namespace archive { namespace detail { // No instantiate_ptr_serialization overloads generated by // BOOST_SERIALIZATION_REGISTER_ARCHIVE that lexically follow the call diff --git a/include/boost/archive/dinkumware.hpp b/include/boost/archive/dinkumware.hpp index 90ba6271..a69d3b89 100644 --- a/include/boost/archive/dinkumware.hpp +++ b/include/boost/archive/dinkumware.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // dinkumware.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -29,7 +29,7 @@ namespace std { // define i/o operators for 64 bit integers template -basic_ostream & +basic_ostream & operator<<(basic_ostream & os, boost::uint64_t t){ // octal rendering of 64 bit number would be 22 octets + eos CharType d[23]; @@ -66,7 +66,7 @@ operator<<(basic_ostream & os, boost::uint64_t t){ } template -basic_ostream & +basic_ostream & operator<<(basic_ostream &os, boost::int64_t t){ if(0 <= t){ os << static_cast(t); @@ -79,7 +79,7 @@ operator<<(basic_ostream &os, boost::int64_t t){ } template -basic_istream & +basic_istream & operator>>(basic_istream &is, boost::int64_t & t){ CharType d; do{ @@ -119,7 +119,7 @@ operator>>(basic_istream &is, boost::int64_t & t){ } template -basic_istream & +basic_istream & operator>>(basic_istream &is, boost::uint64_t & t){ boost::int64_t it; is >> it; @@ -130,7 +130,7 @@ operator>>(basic_istream &is, boost::uint64_t & t){ //#endif template<> -class back_insert_iterator > : public +class back_insert_iterator > : public iterator { public: @@ -140,7 +140,7 @@ public: explicit back_insert_iterator(container_type & s) : container(& s) {} // construct with container - + back_insert_iterator & operator=( container_type::const_reference Val_ ){ // push value into container @@ -167,7 +167,7 @@ protected: container_type *container; // pointer to container }; -template +template inline back_insert_iterator > back_inserter( basic_string & s ){ @@ -175,7 +175,7 @@ inline back_insert_iterator > back_inserter( } template<> -class back_insert_iterator > : public +class back_insert_iterator > : public iterator { public: @@ -185,7 +185,7 @@ public: explicit back_insert_iterator(container_type & s) : container(& s) {} // construct with container - + back_insert_iterator & operator=( container_type::const_reference Val_ ){ // push value into container @@ -212,7 +212,7 @@ protected: container_type *container; // pointer to container }; -template +template inline back_insert_iterator > back_inserter( basic_string & s ){ diff --git a/include/boost/archive/impl/basic_xml_grammar.hpp b/include/boost/archive/impl/basic_xml_grammar.hpp index cc88d4fd..8f70e3d2 100644 --- a/include/boost/archive/impl/basic_xml_grammar.hpp +++ b/include/boost/archive/impl/basic_xml_grammar.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // basic_xml_grammar.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -70,7 +70,7 @@ public: // one compiler (Compaq C++ 6.5 in strict_ansi mode) chokes otherwise. struct return_values; friend struct return_values; - + private: typedef typename std::basic_istream IStream; typedef typename std::basic_string StringType; @@ -81,16 +81,16 @@ private: > scanner_t; typedef typename boost::spirit::classic::rule rule_t; // Start grammar definition - rule_t + rule_t Reference, - Eq, + Eq, STag, ETag, LetterOrUnderscoreOrColon, - AttValue, - CharRef1, - CharRef2, - CharRef, + AttValue, + CharRef1, + CharRef2, + CharRef, AmpRef, LTRef, GTRef, @@ -127,11 +127,11 @@ private: chset_t BaseChar, Ideographic, - Char, - Letter, + Char, + Letter, Digit, CombiningChar, - Extender, + Extender, Sch, NameChar; @@ -139,7 +139,7 @@ private: bool my_parse( IStream & is, - const rule_t &rule_, + const rule_t &rule_, const CharType delimiter = L'>' ) const ; public: diff --git a/include/boost/archive/iterators/base64_exception.hpp b/include/boost/archive/iterators/base64_exception.hpp index 8f9208b6..4aa8151c 100644 --- a/include/boost/archive/iterators/base64_exception.hpp +++ b/include/boost/archive/iterators/base64_exception.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // base64_exception.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/archive/iterators/base64_from_binary.hpp b/include/boost/archive/iterators/base64_from_binary.hpp index ee849944..bd0b38fa 100644 --- a/include/boost/archive/iterators/base64_from_binary.hpp +++ b/include/boost/archive/iterators/base64_from_binary.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // base64_from_binary.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -20,15 +20,15 @@ #include // size_t #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -68,10 +68,10 @@ struct from_6_bit { //template template< - class Base, + class Base, class CharType = typename boost::iterator_value::type > -class base64_from_binary : +class base64_from_binary : public transform_iterator< detail::from_6_bit, Base @@ -93,7 +93,7 @@ public: ) {} // intel 7.1 doesn't like default copy constructor - base64_from_binary(const base64_from_binary & rhs) : + base64_from_binary(const base64_from_binary & rhs) : super_t( Base(rhs.base_reference()), detail::from_6_bit() diff --git a/include/boost/archive/iterators/binary_from_base64.hpp b/include/boost/archive/iterators/binary_from_base64.hpp index 89b8f889..5aeccb3a 100644 --- a/include/boost/archive/iterators/binary_from_base64.hpp +++ b/include/boost/archive/iterators/binary_from_base64.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // binary_from_base64.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -24,7 +24,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -78,7 +78,7 @@ struct to_6_bit { // ideal. This is also addressed here. template< - class Base, + class Base, class CharType = typename boost::iterator_value::type > class binary_from_base64 : public @@ -102,7 +102,7 @@ public: ) {} // intel 7.1 doesn't like default copy constructor - binary_from_base64(const binary_from_base64 & rhs) : + binary_from_base64(const binary_from_base64 & rhs) : super_t( Base(rhs.base_reference()), detail::to_6_bit() diff --git a/include/boost/archive/iterators/dataflow.hpp b/include/boost/archive/iterators/dataflow.hpp index 07733d5f..0c69458d 100644 --- a/include/boost/archive/iterators/dataflow.hpp +++ b/include/boost/archive/iterators/dataflow.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // dataflow.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -31,7 +31,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { diff --git a/include/boost/archive/iterators/dataflow_exception.hpp b/include/boost/archive/iterators/dataflow_exception.hpp index e3e18605..47f2500b 100644 --- a/include/boost/archive/iterators/dataflow_exception.hpp +++ b/include/boost/archive/iterators/dataflow_exception.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // dataflow_exception.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/archive/iterators/escape.hpp b/include/boost/archive/iterators/escape.hpp index 103b31e0..9af34ac9 100644 --- a/include/boost/archive/iterators/escape.hpp +++ b/include/boost/archive/iterators/escape.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // escape.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -22,7 +22,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -30,10 +30,10 @@ namespace iterators { // insert escapes into text template -class escape : +class escape : public boost::iterator_adaptor< - Derived, - Base, + Derived, + Base, typename boost::iterator_value::type, single_pass_traversal_tag, typename boost::iterator_value::type @@ -44,8 +44,8 @@ class escape : friend class boost::iterator_core_access; typedef typename boost::iterator_adaptor< - Derived, - Base, + Derived, + Base, base_value_type, single_pass_traversal_tag, base_value_type @@ -58,7 +58,7 @@ class escape : m_full = true; } - //Access the value referred to + //Access the value referred to reference_type dereference() const { if(!m_full) const_cast(this)->dereference_impl(); @@ -98,7 +98,7 @@ class escape : bool m_full; base_value_type m_current_value; public: - escape(Base base) : + escape(Base base) : super_t(base), m_bnext(NULL), m_bend(NULL), diff --git a/include/boost/archive/iterators/insert_linebreaks.hpp b/include/boost/archive/iterators/insert_linebreaks.hpp index 2504b030..c75ea841 100644 --- a/include/boost/archive/iterators/insert_linebreaks.hpp +++ b/include/boost/archive/iterators/insert_linebreaks.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // insert_linebreaks.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -26,18 +26,18 @@ namespace std{ using ::memcpy; } #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // insert line break every N characters template< - class Base, - int N, + class Base, + int N, class CharType = typename boost::iterator_value::type > -class insert_linebreaks : +class insert_linebreaks : public iterator_adaptor< insert_linebreaks, Base, @@ -86,7 +86,7 @@ public: m_count(0) {} // intel 7.1 doesn't like default copy constructor - insert_linebreaks(const insert_linebreaks & rhs) : + insert_linebreaks(const insert_linebreaks & rhs) : super_t(rhs.base_reference()), m_count(rhs.m_count) {} diff --git a/include/boost/archive/iterators/istream_iterator.hpp b/include/boost/archive/iterators/istream_iterator.hpp index a187f605..05b87996 100644 --- a/include/boost/archive/iterators/istream_iterator.hpp +++ b/include/boost/archive/iterators/istream_iterator.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // istream_iterator.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,13 +25,13 @@ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { // given a type, make an input iterator based on a pointer to that type template -class istream_iterator : +class istream_iterator : public boost::iterator_facade< istream_iterator, Elem, @@ -48,13 +48,13 @@ class istream_iterator : Elem > super_t; typedef typename std::basic_istream istream_type; - + bool equal(const this_t & rhs) const { // note: only works for comparison against end of stream return m_istream == rhs.m_istream; } - //Access the value referred to + //Access the value referred to Elem dereference() const { return static_cast(m_istream->peek()); } diff --git a/include/boost/archive/iterators/mb_from_wchar.hpp b/include/boost/archive/iterators/mb_from_wchar.hpp index eb30480c..dbd17b7c 100644 --- a/include/boost/archive/iterators/mb_from_wchar.hpp +++ b/include/boost/archive/iterators/mb_from_wchar.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // mb_from_wchar.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -23,7 +23,7 @@ #endif #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::mbstate_t; } // namespace std #endif @@ -31,7 +31,7 @@ namespace std{ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -41,8 +41,8 @@ namespace iterators { template // the input iterator class mb_from_wchar : public boost::iterator_adaptor< - mb_from_wchar, - Base, + mb_from_wchar, + Base, wchar_t, single_pass_traversal_tag, char @@ -51,8 +51,8 @@ class mb_from_wchar friend class boost::iterator_core_access; typedef typename boost::iterator_adaptor< - mb_from_wchar, - Base, + mb_from_wchar, + Base, wchar_t, single_pass_traversal_tag, char @@ -75,7 +75,7 @@ class mb_from_wchar bool equal(const mb_from_wchar & rhs) const { // once the value is filled, the base_reference has been incremented // so don't permit comparison anymore. - return + return 0 == m_bend && 0 == m_bnext && this->base_reference() == rhs.base_reference() @@ -102,7 +102,7 @@ class mb_from_wchar void increment(){ if(++m_bnext < m_bend) return; - m_bend = + m_bend = m_bnext = 0; ++(this->base_reference()); m_full = false; @@ -127,7 +127,7 @@ public: m_full(false) {} // intel 7.1 doesn't like default copy constructor - mb_from_wchar(const mb_from_wchar & rhs) : + mb_from_wchar(const mb_from_wchar & rhs) : super_t(rhs.base_reference()), m_bend(rhs.m_bend), m_bnext(rhs.m_bnext), diff --git a/include/boost/archive/iterators/ostream_iterator.hpp b/include/boost/archive/iterators/ostream_iterator.hpp index 49a9b990..80b5d1d4 100644 --- a/include/boost/archive/iterators/ostream_iterator.hpp +++ b/include/boost/archive/iterators/ostream_iterator.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // ostream_iterator.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -24,13 +24,13 @@ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { // given a type, make an input iterator based on a pointer to that type template -class ostream_iterator : +class ostream_iterator : public boost::iterator_facade< ostream_iterator, Elem, @@ -43,7 +43,7 @@ class ostream_iterator : typedef Elem char_type; typedef std::basic_ostream ostream_type; - //emulate the behavior of std::ostream + //emulate the behavior of std::ostream ostream_iterator & dereference() const { return const_cast(*this); } diff --git a/include/boost/archive/iterators/remove_whitespace.hpp b/include/boost/archive/iterators/remove_whitespace.hpp index c3580ab2..eb756f37 100644 --- a/include/boost/archive/iterators/remove_whitespace.hpp +++ b/include/boost/archive/iterators/remove_whitespace.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // remove_whitespace.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ // here is the default standard implementation of the functor used // by the filter iterator to remove spaces. Unfortunately usage // of this implementation in combination with spirit trips a bug -// VC 6.5. The only way I can find to work around it is to +// VC 6.5. The only way I can find to work around it is to // implement a special non-standard version for this platform #ifndef BOOST_NO_CWCTYPE @@ -74,7 +74,7 @@ struct remove_whitespace_predicate /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // convert base64 file data (including whitespace and padding) to binary -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -122,15 +122,15 @@ public: m_full = false; ++(this->base_reference()); } - filter_iterator(Base start) : - super_t(start), + filter_iterator(Base start) : + super_t(start), m_full(false) {} filter_iterator(){} }; template -class remove_whitespace : +class remove_whitespace : public filter_iterator< remove_whitespace_predicate< typename boost::iterator_value::type @@ -155,7 +155,7 @@ public: super_t(Base(static_cast< T >(start))) {} // intel 7.1 doesn't like default copy constructor - remove_whitespace(const remove_whitespace & rhs) : + remove_whitespace(const remove_whitespace & rhs) : super_t(rhs.base_reference()) {} }; diff --git a/include/boost/archive/iterators/transform_width.hpp b/include/boost/archive/iterators/transform_width.hpp index 09c050a9..162dccfa 100644 --- a/include/boost/archive/iterators/transform_width.hpp +++ b/include/boost/archive/iterators/transform_width.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // transform_width.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -29,7 +29,7 @@ #include // std::min -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -37,12 +37,12 @@ namespace iterators { // class used by text archives to translate char strings to wchar_t // strings of the currently selected locale template< - class Base, - int BitsOut, - int BitsIn, + class Base, + int BitsOut, + int BitsIn, class CharType = typename boost::iterator_value::type // output character > -class transform_width : +class transform_width : public boost::iterator_adaptor< transform_width, Base, @@ -108,19 +108,19 @@ class transform_width : public: // make composible buy using templated constructor template - transform_width(T start) : + transform_width(T start) : super_t(Base(static_cast< T >(start))), m_buffer_out_full(false), m_buffer_out(0), - // To disable GCC warning, but not truly necessary - //(m_buffer_in will be initialized later before being + // To disable GCC warning, but not truly necessary + //(m_buffer_in will be initialized later before being //used because m_remaining_bits == 0) - m_buffer_in(0), + m_buffer_in(0), m_remaining_bits(0), m_end_of_sequence(false) {} // intel 7.1 doesn't like default copy constructor - transform_width(const transform_width & rhs) : + transform_width(const transform_width & rhs) : super_t(rhs.base_reference()), m_buffer_out_full(rhs.m_buffer_out_full), m_buffer_out(rhs.m_buffer_out), @@ -131,9 +131,9 @@ public: }; template< - class Base, - int BitsOut, - int BitsIn, + class Base, + int BitsOut, + int BitsIn, class CharType > void transform_width::fill() { diff --git a/include/boost/archive/iterators/unescape.hpp b/include/boost/archive/iterators/unescape.hpp index abf62406..7697beb8 100644 --- a/include/boost/archive/iterators/unescape.hpp +++ b/include/boost/archive/iterators/unescape.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // unescape.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -21,7 +21,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -29,10 +29,10 @@ namespace iterators { // class used by text archives to translate char strings to wchar_t // strings of the currently selected locale template -class unescape +class unescape : public boost::iterator_adaptor< unescape, - Base, + Base, typename pointee::type, single_pass_traversal_tag, typename pointee::type @@ -40,8 +40,8 @@ class unescape { friend class boost::iterator_core_access; typedef typename boost::iterator_adaptor< - unescape, - Base, + unescape, + Base, typename pointee::type, single_pass_traversal_tag, typename pointee::type @@ -75,7 +75,7 @@ private: public: - unescape(Base base) : + unescape(Base base) : super_t(base), m_full(false) {} diff --git a/include/boost/archive/iterators/wchar_from_mb.hpp b/include/boost/archive/iterators/wchar_from_mb.hpp index 4cdb2e0d..6067245d 100644 --- a/include/boost/archive/iterators/wchar_from_mb.hpp +++ b/include/boost/archive/iterators/wchar_from_mb.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // wchar_from_mb.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::mbstate_t; } // namespace std #endif @@ -39,7 +39,7 @@ namespace std{ #include -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -47,10 +47,10 @@ namespace iterators { // class used by text archives to translate char strings to wchar_t // strings of the currently selected locale template -class wchar_from_mb +class wchar_from_mb : public boost::iterator_adaptor< - wchar_from_mb, - Base, + wchar_from_mb, + Base, wchar_t, single_pass_traversal_tag, wchar_t @@ -58,8 +58,8 @@ class wchar_from_mb { friend class boost::iterator_core_access; typedef typename boost::iterator_adaptor< - wchar_from_mb, - Base, + wchar_from_mb, + Base, wchar_t, single_pass_traversal_tag, wchar_t @@ -126,7 +126,7 @@ class wchar_from_mb public: // make composible buy using templated constructor template - wchar_from_mb(T start) : + wchar_from_mb(T start) : super_t(Base(static_cast< T >(start))), m_mbs(std::mbstate_t()) { diff --git a/include/boost/archive/iterators/xml_escape.hpp b/include/boost/archive/iterators/xml_escape.hpp index c838a73b..c45733ea 100644 --- a/include/boost/archive/iterators/xml_escape.hpp +++ b/include/boost/archive/iterators/xml_escape.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_escape.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -19,7 +19,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { @@ -27,7 +27,7 @@ namespace iterators { // insert escapes into xml text template -class xml_escape +class xml_escape : public escape, Base> { friend class boost::iterator_core_access; @@ -43,14 +43,14 @@ public: super_t(Base(static_cast< T >(start))) {} // intel 7.1 doesn't like default copy constructor - xml_escape(const xml_escape & rhs) : + xml_escape(const xml_escape & rhs) : super_t(rhs.base_reference()) {} }; template char xml_escape::fill( - const char * & bstart, + const char * & bstart, const char * & bend ){ char current_value = * this->base_reference(); @@ -83,7 +83,7 @@ char xml_escape::fill( template wchar_t xml_escape::fill( - const wchar_t * & bstart, + const wchar_t * & bstart, const wchar_t * & bend ){ wchar_t current_value = * this->base_reference(); diff --git a/include/boost/archive/iterators/xml_unescape.hpp b/include/boost/archive/iterators/xml_unescape.hpp index 9d3c3af9..7fc9fd5f 100644 --- a/include/boost/archive/iterators/xml_unescape.hpp +++ b/include/boost/archive/iterators/xml_unescape.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_unescape.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,14 +25,14 @@ #include #include -namespace boost { +namespace boost { namespace archive { namespace iterators { /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // replace &??? xml escape sequences with the corresponding characters template -class xml_unescape +class xml_unescape : public unescape, Base> { friend class boost::iterator_core_access; @@ -44,7 +44,7 @@ class xml_unescape return unescape, Base>::dereference(); } public: - // msvc versions prior to 14.0 crash with and ICE + // msvc versions prior to 14.0 crash with and ICE #if BOOST_WORKAROUND(BOOST_MSVC, < 1900) typedef int value_type; #else @@ -55,11 +55,11 @@ public: value_type drain(); template - xml_unescape(T start) : + xml_unescape(T start) : super_t(Base(static_cast< T >(start))) {} // intel 7.1 doesn't like default copy constructor - xml_unescape(const xml_unescape & rhs) : + xml_unescape(const xml_unescape & rhs) : super_t(rhs.base_reference()) {} }; @@ -82,8 +82,8 @@ void xml_unescape::drain_residue(const char * literal){ // iterator refenence which would make subsequent iterator comparisons // incorrect and thereby break the composiblity of iterators. template -typename xml_unescape::value_type -//int +typename xml_unescape::value_type +//int xml_unescape::drain(){ value_type retval = * this->base_reference(); if('&' != retval){ diff --git a/include/boost/archive/iterators/xml_unescape_exception.hpp b/include/boost/archive/iterators/xml_unescape_exception.hpp index 71a64378..325f42cd 100644 --- a/include/boost/archive/iterators/xml_unescape_exception.hpp +++ b/include/boost/archive/iterators/xml_unescape_exception.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_unescape_exception.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/archive/polymorphic_binary_iarchive.hpp b/include/boost/archive/polymorphic_binary_iarchive.hpp index 20559bd8..38cbd573 100644 --- a/include/boost/archive/polymorphic_binary_iarchive.hpp +++ b/include/boost/archive/polymorphic_binary_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_binary_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,10 +25,10 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class BOOST_SYMBOL_VISIBLE polymorphic_binary_iarchive : +class BOOST_SYMBOL_VISIBLE polymorphic_binary_iarchive : public detail::polymorphic_iarchive_route { public: diff --git a/include/boost/archive/polymorphic_binary_oarchive.hpp b/include/boost/archive/polymorphic_binary_oarchive.hpp index 96febd7a..8bd85245 100644 --- a/include/boost/archive/polymorphic_binary_oarchive.hpp +++ b/include/boost/archive/polymorphic_binary_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_binary_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -20,7 +20,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { class BOOST_SYMBOL_VISIBLE polymorphic_binary_oarchive : diff --git a/include/boost/archive/polymorphic_iarchive.hpp b/include/boost/archive/polymorphic_iarchive.hpp index d3c59a9f..199ae610 100644 --- a/include/boost/archive/polymorphic_iarchive.hpp +++ b/include/boost/archive/polymorphic_iarchive.hpp @@ -17,7 +17,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include // std::size_t -#include // ULONG_MAX +#include // ULONG_MAX #include #include diff --git a/include/boost/archive/polymorphic_oarchive.hpp b/include/boost/archive/polymorphic_oarchive.hpp index edac4edb..debdee13 100644 --- a/include/boost/archive/polymorphic_oarchive.hpp +++ b/include/boost/archive/polymorphic_oarchive.hpp @@ -17,7 +17,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include // size_t -#include // ULONG_MAX +#include // ULONG_MAX #include #include @@ -136,7 +136,7 @@ public: }; // note: preserve naming symmetry -class BOOST_SYMBOL_VISIBLE polymorphic_oarchive : +class BOOST_SYMBOL_VISIBLE polymorphic_oarchive : public polymorphic_oarchive_impl { public: diff --git a/include/boost/archive/polymorphic_text_iarchive.hpp b/include/boost/archive/polymorphic_text_iarchive.hpp index 3e59bfe6..f4a1cf1e 100644 --- a/include/boost/archive/polymorphic_text_iarchive.hpp +++ b/include/boost/archive/polymorphic_text_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_text_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,10 +25,10 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class BOOST_SYMBOL_VISIBLE polymorphic_text_iarchive : +class BOOST_SYMBOL_VISIBLE polymorphic_text_iarchive : public detail::polymorphic_iarchive_route { public: diff --git a/include/boost/archive/polymorphic_text_oarchive.hpp b/include/boost/archive/polymorphic_text_oarchive.hpp index 233d37c7..015c6e95 100644 --- a/include/boost/archive/polymorphic_text_oarchive.hpp +++ b/include/boost/archive/polymorphic_text_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_text_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -20,7 +20,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { class BOOST_SYMBOL_VISIBLE polymorphic_text_oarchive : diff --git a/include/boost/archive/polymorphic_text_wiarchive.hpp b/include/boost/archive/polymorphic_text_wiarchive.hpp index 96afe0eb..c3395bf8 100644 --- a/include/boost/archive/polymorphic_text_wiarchive.hpp +++ b/include/boost/archive/polymorphic_text_wiarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_text_wiarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -29,10 +29,10 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class BOOST_SYMBOL_VISIBLE polymorphic_text_wiarchive : +class BOOST_SYMBOL_VISIBLE polymorphic_text_wiarchive : public detail::polymorphic_iarchive_route { public: diff --git a/include/boost/archive/polymorphic_text_woarchive.hpp b/include/boost/archive/polymorphic_text_woarchive.hpp index fa0a3aec..6de0e8c5 100644 --- a/include/boost/archive/polymorphic_text_woarchive.hpp +++ b/include/boost/archive/polymorphic_text_woarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_text_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -24,7 +24,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { class BOOST_SYMBOL_VISIBLE polymorphic_text_woarchive : @@ -45,6 +45,6 @@ BOOST_SERIALIZATION_REGISTER_ARCHIVE( boost::archive::polymorphic_text_woarchive ) -#endif // BOOST_NO_STD_WSTREAMBUF +#endif // BOOST_NO_STD_WSTREAMBUF #endif // BOOST_ARCHIVE_POLYMORPHIC_TEXT_WOARCHIVE_HPP diff --git a/include/boost/archive/polymorphic_xml_iarchive.hpp b/include/boost/archive/polymorphic_xml_iarchive.hpp index 0b17b551..0c83a192 100644 --- a/include/boost/archive/polymorphic_xml_iarchive.hpp +++ b/include/boost/archive/polymorphic_xml_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_xml_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,10 +25,10 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class BOOST_SYMBOL_VISIBLE polymorphic_xml_iarchive : +class BOOST_SYMBOL_VISIBLE polymorphic_xml_iarchive : public detail::polymorphic_iarchive_route { public: diff --git a/include/boost/archive/polymorphic_xml_oarchive.hpp b/include/boost/archive/polymorphic_xml_oarchive.hpp index a9fc8242..d7cb3bcd 100644 --- a/include/boost/archive/polymorphic_xml_oarchive.hpp +++ b/include/boost/archive/polymorphic_xml_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_xml_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -20,7 +20,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { class BOOST_SYMBOL_VISIBLE polymorphic_xml_oarchive : diff --git a/include/boost/archive/polymorphic_xml_wiarchive.hpp b/include/boost/archive/polymorphic_xml_wiarchive.hpp index 688ff4d0..77ed5aa4 100644 --- a/include/boost/archive/polymorphic_xml_wiarchive.hpp +++ b/include/boost/archive/polymorphic_xml_wiarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_xml_wiarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -24,10 +24,10 @@ #include #include -namespace boost { +namespace boost { namespace archive { -class BOOST_SYMBOL_VISIBLE polymorphic_xml_wiarchive : +class BOOST_SYMBOL_VISIBLE polymorphic_xml_wiarchive : public detail::polymorphic_iarchive_route { public: @@ -45,6 +45,6 @@ BOOST_SERIALIZATION_REGISTER_ARCHIVE( boost::archive::polymorphic_xml_wiarchive ) -#endif // BOOST_NO_STD_WSTREAMBUF +#endif // BOOST_NO_STD_WSTREAMBUF #endif // BOOST_ARCHIVE_POLYMORPHIC_XML_WIARCHIVE_HPP diff --git a/include/boost/archive/polymorphic_xml_woarchive.hpp b/include/boost/archive/polymorphic_xml_woarchive.hpp index 2606010d..f6d989c0 100644 --- a/include/boost/archive/polymorphic_xml_woarchive.hpp +++ b/include/boost/archive/polymorphic_xml_woarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_xml_woarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -24,7 +24,7 @@ #include #include -namespace boost { +namespace boost { namespace archive { class BOOST_SYMBOL_VISIBLE polymorphic_xml_woarchive : diff --git a/include/boost/archive/text_iarchive.hpp b/include/boost/archive/text_iarchive.hpp index d9d60adf..8675385e 100644 --- a/include/boost/archive/text_iarchive.hpp +++ b/include/boost/archive/text_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // text_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,7 +32,7 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { namespace detail { @@ -65,16 +65,16 @@ protected: load(v); t = boost::serialization::item_version_type(v); } - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void load(char * t); #ifndef BOOST_NO_INTRINSIC_WCHAR_T - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void load(wchar_t * t); #endif - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void load(std::string &s); #ifndef BOOST_NO_STD_WSTRING - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void load(std::wstring &ws); #endif template @@ -85,10 +85,10 @@ protected: load_override(class_name_type & t); BOOST_ARCHIVE_DECL void init(); - BOOST_ARCHIVE_DECL + BOOST_ARCHIVE_DECL text_iarchive_impl(std::istream & is, unsigned int flags); // don't import inline definitions! leave this as a reminder. - //BOOST_ARCHIVE_DECL + //BOOST_ARCHIVE_DECL ~text_iarchive_impl(){}; }; @@ -106,10 +106,10 @@ protected: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class BOOST_SYMBOL_VISIBLE text_iarchive : +class BOOST_SYMBOL_VISIBLE text_iarchive : public text_iarchive_impl{ public: text_iarchive(std::istream & is_, unsigned int flags = 0) : diff --git a/include/boost/archive/text_oarchive.hpp b/include/boost/archive/text_oarchive.hpp index e4c6d466..fbea4f83 100644 --- a/include/boost/archive/text_oarchive.hpp +++ b/include/boost/archive/text_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // text_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -21,8 +21,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -39,7 +39,7 @@ namespace std{ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { namespace detail { @@ -70,32 +70,32 @@ protected: void save(const boost::serialization::item_version_type & t){ save(static_cast(t)); } - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void save(const char * t); #ifndef BOOST_NO_INTRINSIC_WCHAR_T - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void save(const wchar_t * t); #endif - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void save(const std::string &s); #ifndef BOOST_NO_STD_WSTRING - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void save(const std::wstring &ws); #endif - BOOST_ARCHIVE_DECL + BOOST_ARCHIVE_DECL text_oarchive_impl(std::ostream & os, unsigned int flags); // don't import inline definitions! leave this as a reminder. - //BOOST_ARCHIVE_DECL + //BOOST_ARCHIVE_DECL ~text_oarchive_impl(){}; public: - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void save_binary(const void *address, std::size_t count); }; // do not derive from this class. If you want to extend this functionality // via inhertance, derived from text_oarchive_impl instead. This will // preserve correct static polymorphism. -class BOOST_SYMBOL_VISIBLE text_oarchive : +class BOOST_SYMBOL_VISIBLE text_oarchive : public text_oarchive_impl { public: diff --git a/include/boost/archive/text_wiarchive.hpp b/include/boost/archive/text_wiarchive.hpp index 3adf068a..d8a5a0a5 100644 --- a/include/boost/archive/text_wiarchive.hpp +++ b/include/boost/archive/text_wiarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // text_wiarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -36,7 +36,7 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { namespace detail { @@ -92,7 +92,7 @@ protected: void load_override(T & t){ basic_text_iarchive::load_override(t); } - BOOST_WARCHIVE_DECL + BOOST_WARCHIVE_DECL text_wiarchive_impl(std::wistream & is, unsigned int flags); ~text_wiarchive_impl(){}; }; @@ -111,10 +111,10 @@ protected: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class BOOST_SYMBOL_VISIBLE text_wiarchive : +class BOOST_SYMBOL_VISIBLE text_wiarchive : public text_wiarchive_impl{ public: text_wiarchive(std::wistream & is, unsigned int flags = 0) : diff --git a/include/boost/archive/text_woarchive.hpp b/include/boost/archive/text_woarchive.hpp index beba62f7..7e4bc362 100644 --- a/include/boost/archive/text_woarchive.hpp +++ b/include/boost/archive/text_woarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // text_woarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -26,8 +26,8 @@ #include // size_t #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -44,7 +44,7 @@ namespace std{ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { namespace detail { @@ -97,7 +97,7 @@ protected: #endif text_woarchive_impl(std::wostream & os, unsigned int flags) : basic_text_oprimitive( - os, + os, 0 != (flags & no_codecvt) ), basic_text_oarchive(flags) @@ -114,7 +114,7 @@ public: #else this->basic_text_oprimitive::save_binary( #endif - address, + address, count ); put(static_cast('\n')); @@ -129,7 +129,7 @@ public: // do not derive from this class. If you want to extend this functionality // via inhertance, derived from text_oarchive_impl instead. This will // preserve correct static polymorphism. -class BOOST_SYMBOL_VISIBLE text_woarchive : +class BOOST_SYMBOL_VISIBLE text_woarchive : public text_woarchive_impl { public: diff --git a/include/boost/archive/tmpdir.hpp b/include/boost/archive/tmpdir.hpp index 400d23b9..35c10a53 100644 --- a/include/boost/archive/tmpdir.hpp +++ b/include/boost/archive/tmpdir.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // tmpdir.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/archive/wcslen.hpp b/include/boost/archive/wcslen.hpp index 0b60004f..6138c3e4 100644 --- a/include/boost/archive/wcslen.hpp +++ b/include/boost/archive/wcslen.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // wcslen.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -19,8 +19,8 @@ #include // size_t #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -30,7 +30,7 @@ namespace std{ // wcslen #if defined(BOOST_DINKUMWARE_STDLIB) && BOOST_DINKUMWARE_STDLIB < 306 \ -|| defined(__LIBCOMO__) +|| defined(__LIBCOMO__) namespace std { inline std::size_t wcslen(const wchar_t * ws) diff --git a/include/boost/archive/xml_archive_exception.hpp b/include/boost/archive/xml_archive_exception.hpp index 82c53ef5..489a2ed1 100644 --- a/include/boost/archive/xml_archive_exception.hpp +++ b/include/boost/archive/xml_archive_exception.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_archive_exception.hpp: -// (C) Copyright 2007 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2007 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -31,7 +31,7 @@ namespace archive { ////////////////////////////////////////////////////////////////////// // exceptions thrown by xml archives // -class BOOST_SYMBOL_VISIBLE xml_archive_exception : +class BOOST_SYMBOL_VISIBLE xml_archive_exception : public virtual boost::archive::archive_exception { public: @@ -41,7 +41,7 @@ public: xml_archive_tag_name_error } exception_code; BOOST_ARCHIVE_DECL xml_archive_exception( - exception_code c, + exception_code c, const char * e1 = NULL, const char * e2 = NULL ); diff --git a/include/boost/archive/xml_iarchive.hpp b/include/boost/archive/xml_iarchive.hpp index abd2f9fc..f1913db1 100644 --- a/include/boost/archive/xml_iarchive.hpp +++ b/include/boost/archive/xml_iarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_iarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,7 +32,7 @@ # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { namespace detail { @@ -44,7 +44,7 @@ class basic_xml_grammar; typedef basic_xml_grammar xml_grammar; template -class BOOST_SYMBOL_VISIBLE xml_iarchive_impl : +class BOOST_SYMBOL_VISIBLE xml_iarchive_impl : public basic_text_iprimitive, public basic_xml_iarchive { @@ -66,13 +66,13 @@ protected: void load(T & t){ basic_text_iprimitive::load(t); } - void + void load(version_type & t){ unsigned int v; load(v); t = version_type(v); } - void + void load(boost::serialization::item_version_type & t){ unsigned int v; load(v); @@ -98,7 +98,7 @@ protected: load_override(class_name_type & t); BOOST_ARCHIVE_DECL void init(); - BOOST_ARCHIVE_DECL + BOOST_ARCHIVE_DECL xml_iarchive_impl(std::istream & is, unsigned int flags); BOOST_ARCHIVE_DECL ~xml_iarchive_impl(); @@ -117,10 +117,10 @@ protected: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { -class BOOST_SYMBOL_VISIBLE xml_iarchive : +class BOOST_SYMBOL_VISIBLE xml_iarchive : public xml_iarchive_impl{ public: xml_iarchive(std::istream & is, unsigned int flags = 0) : diff --git a/include/boost/archive/xml_oarchive.hpp b/include/boost/archive/xml_oarchive.hpp index d0fa8b21..8bb67a26 100644 --- a/include/boost/archive/xml_oarchive.hpp +++ b/include/boost/archive/xml_oarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_oarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -21,8 +21,8 @@ #include // size_t #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -47,7 +47,7 @@ namespace detail { } // namespace detail template -class BOOST_SYMBOL_VISIBLE xml_oarchive_impl : +class BOOST_SYMBOL_VISIBLE xml_oarchive_impl : public basic_text_oprimitive, public basic_xml_oarchive { @@ -63,15 +63,15 @@ protected: void save(const T & t){ basic_text_oprimitive::save(t); } - void + void save(const version_type & t){ save(static_cast(t)); } - void + void save(const boost::serialization::item_version_type & t){ save(static_cast(t)); } - BOOST_ARCHIVE_DECL void + BOOST_ARCHIVE_DECL void save(const char * t); #ifndef BOOST_NO_INTRINSIC_WCHAR_T BOOST_ARCHIVE_DECL void @@ -83,9 +83,9 @@ protected: BOOST_ARCHIVE_DECL void save(const std::wstring &ws); #endif - BOOST_ARCHIVE_DECL + BOOST_ARCHIVE_DECL xml_oarchive_impl(std::ostream & os, unsigned int flags); - BOOST_ARCHIVE_DECL + BOOST_ARCHIVE_DECL ~xml_oarchive_impl(); public: BOOST_ARCHIVE_DECL @@ -105,7 +105,7 @@ public: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { // we use the following because we can't use @@ -114,7 +114,7 @@ namespace archive { // do not derive from this class. If you want to extend this functionality // via inhertance, derived from xml_oarchive_impl instead. This will // preserve correct static polymorphism. -class BOOST_SYMBOL_VISIBLE xml_oarchive : +class BOOST_SYMBOL_VISIBLE xml_oarchive : public xml_oarchive_impl { public: diff --git a/include/boost/archive/xml_wiarchive.hpp b/include/boost/archive/xml_wiarchive.hpp index 2ca3e559..1210fd83 100644 --- a/include/boost/archive/xml_wiarchive.hpp +++ b/include/boost/archive/xml_wiarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_wiarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -50,7 +50,7 @@ class basic_xml_grammar; typedef basic_xml_grammar xml_wgrammar; template -class BOOST_SYMBOL_VISIBLE xml_wiarchive_impl : +class BOOST_SYMBOL_VISIBLE xml_wiarchive_impl : public basic_text_iprimitive, public basic_xml_iarchive { @@ -68,17 +68,17 @@ protected: return is; } template - void + void load(T & t){ basic_text_iprimitive::load(t); } - void + void load(version_type & t){ unsigned int v; load(v); t = version_type(v); } - void + void load(boost::serialization::item_version_type & t){ unsigned int v; load(v); @@ -102,11 +102,11 @@ protected: } BOOST_WARCHIVE_DECL void load_override(class_name_type & t); - BOOST_WARCHIVE_DECL void + BOOST_WARCHIVE_DECL void init(); - BOOST_WARCHIVE_DECL + BOOST_WARCHIVE_DECL xml_wiarchive_impl(std::wistream & is, unsigned int flags) ; - BOOST_WARCHIVE_DECL + BOOST_WARCHIVE_DECL ~xml_wiarchive_impl(); }; @@ -114,7 +114,7 @@ protected: } // namespace boost #ifdef BOOST_MSVC -# pragma warning(pop) +# pragma warning(pop) #endif #include // pops abi_suffix.hpp pragmas @@ -124,7 +124,7 @@ protected: # pragma warning(disable : 4511 4512) #endif -namespace boost { +namespace boost { namespace archive { class BOOST_SYMBOL_VISIBLE xml_wiarchive : diff --git a/include/boost/archive/xml_woarchive.hpp b/include/boost/archive/xml_woarchive.hpp index e6ac50de..0baaec35 100644 --- a/include/boost/archive/xml_woarchive.hpp +++ b/include/boost/archive/xml_woarchive.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // xml_woarchive.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -22,8 +22,8 @@ #else #include // size_t #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -76,23 +76,23 @@ protected: save(const version_type & t){ save(static_cast(t)); } - void + void save(const boost::serialization::item_version_type & t){ save(static_cast(t)); } BOOST_WARCHIVE_DECL void save(const char * t); #ifndef BOOST_NO_INTRINSIC_WCHAR_T - BOOST_WARCHIVE_DECL void + BOOST_WARCHIVE_DECL void save(const wchar_t * t); #endif - BOOST_WARCHIVE_DECL void + BOOST_WARCHIVE_DECL void save(const std::string &s); #ifndef BOOST_NO_STD_WSTRING BOOST_WARCHIVE_DECL void save(const std::wstring &ws); #endif - BOOST_WARCHIVE_DECL + BOOST_WARCHIVE_DECL xml_woarchive_impl(std::wostream & os, unsigned int flags); BOOST_WARCHIVE_DECL ~xml_woarchive_impl(); diff --git a/include/boost/serialization/access.hpp b/include/boost/serialization/access.hpp index f6581acc..f0c27a7e 100644 --- a/include/boost/serialization/access.hpp +++ b/include/boost/serialization/access.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // access.hpp: interface for serialization system. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -41,8 +41,8 @@ namespace detail { struct member_loader; } // namespace detail -// use an "accessor class so that we can use: -// "friend class boost::serialization::access;" +// use an "accessor class so that we can use: +// "friend class boost::serialization::access;" // in any serialized class to permit clean, safe access to private class members // by the serialization system @@ -62,20 +62,20 @@ public: friend class archive::detail::oserializer; template friend inline void serialize( - Archive & ar, - T & t, + Archive & ar, + T & t, const unsigned int file_version ); template friend inline void save_construct_data( - Archive & ar, - const T * t, + Archive & ar, + const T * t, const unsigned int file_version ); template friend inline void load_construct_data( - Archive & ar, - T * t, + Archive & ar, + T * t, const unsigned int file_version ); #endif @@ -83,7 +83,7 @@ public: // pass calls to users's class implementation template static void member_save( - Archive & ar, + Archive & ar, //const T & t, T & t, const unsigned int file_version @@ -92,7 +92,7 @@ public: } template static void member_load( - Archive & ar, + Archive & ar, T & t, const unsigned int file_version ){ @@ -100,15 +100,15 @@ public: } template static void serialize( - Archive & ar, - T & t, + Archive & ar, + T & t, const unsigned int file_version ){ // note: if you get a compile time error here with a // message something like: // cannot convert parameter 1 from to - // a likely possible cause is that the class T contains a - // serialize function - but that serialize function isn't + // a likely possible cause is that the class T contains a + // serialize function - but that serialize function isn't // a template and corresponds to a file type different than // the class Archive. To resolve this, don't include an // archive type other than that for which the serialization diff --git a/include/boost/serialization/archive_input_unordered_map.hpp b/include/boost/serialization/archive_input_unordered_map.hpp index ccf806b1..d2576493 100644 --- a/include/boost/serialization/archive_input_unordered_map.hpp +++ b/include/boost/serialization/archive_input_unordered_map.hpp @@ -10,7 +10,7 @@ // serialization/unordered_map.hpp: // serialization for stl unordered_map templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -24,7 +24,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { namespace stl { @@ -33,18 +33,18 @@ template struct archive_input_unordered_map { inline void operator()( - Archive &ar, - Container &s, + Archive &ar, + Container &s, const unsigned int v ){ typedef typename Container::value_type type; detail::stack_construct t(ar, v); ar >> boost::serialization::make_nvp("item", t.reference()); - std::pair result = + std::pair result = s.insert(boost::move(t.reference())); // note: the following presumes that the map::value_type was NOT tracked // in the archive. This is the usual case, but here there is no way - // to determine that. + // to determine that. if(result.second){ ar.reset_object_address( & (result.first->second), @@ -59,8 +59,8 @@ template struct archive_input_unordered_multimap { inline void operator()( - Archive &ar, - Container &s, + Archive &ar, + Container &s, const unsigned int v ){ typedef typename Container::value_type type; @@ -70,7 +70,7 @@ struct archive_input_unordered_multimap s.insert(t.reference()); // note: the following presumes that the map::value_type was NOT tracked // in the archive. This is the usual case, but here there is no way - // to determine that. + // to determine that. ar.reset_object_address( & result->second, & t.reference() diff --git a/include/boost/serialization/archive_input_unordered_set.hpp b/include/boost/serialization/archive_input_unordered_set.hpp index 7f0003cc..6ad0c275 100644 --- a/include/boost/serialization/archive_input_unordered_set.hpp +++ b/include/boost/serialization/archive_input_unordered_set.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // archive_input_unordered_set.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -32,15 +32,15 @@ template struct archive_input_unordered_set { inline void operator()( - Archive &ar, - Container &s, + Archive &ar, + Container &s, const unsigned int v ){ typedef typename Container::value_type type; detail::stack_construct t(ar, v); // borland fails silently w/o full namespace ar >> boost::serialization::make_nvp("item", t.reference()); - std::pair result = + std::pair result = s.insert(boost::move(t.reference())); if(result.second) ar.reset_object_address(& (* result.first), & t.reference()); @@ -52,8 +52,8 @@ template struct archive_input_unordered_multiset { inline void operator()( - Archive &ar, - Container &s, + Archive &ar, + Container &s, const unsigned int v ){ typedef typename Container::value_type type; diff --git a/include/boost/serialization/array.hpp b/include/boost/serialization/array.hpp index 612d1a61..c038cf04 100644 --- a/include/boost/serialization/array.hpp +++ b/include/boost/serialization/array.hpp @@ -18,8 +18,8 @@ #include #include // std::size_t -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -39,7 +39,7 @@ void serialize(Archive& ar, std::array& a, const unsigned int /* version */ "elems", *static_cast(static_cast(a.data())) ); - + } } } // end namespace boost::serialization diff --git a/include/boost/serialization/array_optimization.hpp b/include/boost/serialization/array_optimization.hpp index 40dffba8..278bf027 100644 --- a/include/boost/serialization/array_optimization.hpp +++ b/include/boost/serialization/array_optimization.hpp @@ -9,8 +9,8 @@ #include // msvc 6.0 needs this for warning suppression #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif diff --git a/include/boost/serialization/array_wrapper.hpp b/include/boost/serialization/array_wrapper.hpp index adf436e1..80251be9 100644 --- a/include/boost/serialization/array_wrapper.hpp +++ b/include/boost/serialization/array_wrapper.hpp @@ -11,8 +11,8 @@ #include // msvc 6.0 needs this for warning suppression #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -81,18 +81,18 @@ public: { ar.load_array(*this,version); } - + // default implementation template void serialize(Archive &ar, const unsigned int version) { - typedef typename + typedef typename boost::serialization::use_array_optimization::template apply< - typename remove_const< T >::type + typename remove_const< T >::type >::type use_optimized; serialize_optimized(ar,version,use_optimized()); } - + T * address() const { return m_t; diff --git a/include/boost/serialization/base_object.hpp b/include/boost/serialization/base_object.hpp index 1a82cecd..92131b43 100644 --- a/include/boost/serialization/base_object.hpp +++ b/include/boost/serialization/base_object.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // base_object.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -17,7 +17,7 @@ // See http://www.boost.org for updates, documentation, and revision history. // if no archive headers have been included this is a no op -// this is to permit BOOST_EXPORT etc to be included in a +// this is to permit BOOST_EXPORT etc to be included in a // file declaration header #include @@ -84,7 +84,7 @@ namespace detail } // namespace detail template -typename detail::base_cast::type & +typename detail::base_cast::type & base_object(Derived &d) { BOOST_STATIC_ASSERT(( is_base_and_derived::value)); diff --git a/include/boost/serialization/binary_object.hpp b/include/boost/serialization/binary_object.hpp index 5c9038e5..f5503064 100644 --- a/include/boost/serialization/binary_object.hpp +++ b/include/boost/serialization/binary_object.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // nvp.hpp: interface for serialization system. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -21,8 +21,8 @@ #include // std::size_t #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -67,7 +67,7 @@ struct binary_object : // just a little helper to support the convention that all serialization // wrappers follow the naming convention make_xxxxx -inline +inline const binary_object make_binary_object(const void * t, std::size_t size){ return binary_object(t, size); diff --git a/include/boost/serialization/boost_array.hpp b/include/boost/serialization/boost_array.hpp index 9e3e2208..f94aed5c 100644 --- a/include/boost/serialization/boost_array.hpp +++ b/include/boost/serialization/boost_array.hpp @@ -11,8 +11,8 @@ #include // msvc 6.0 needs this for warning suppression #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif diff --git a/include/boost/serialization/boost_unordered_map.hpp b/include/boost/serialization/boost_unordered_map.hpp index 8913b31f..99897c03 100644 --- a/include/boost/serialization/boost_unordered_map.hpp +++ b/include/boost/serialization/boost_unordered_map.hpp @@ -10,7 +10,7 @@ // serialization/unordered_map.hpp: // serialization for stl unordered_map templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -28,13 +28,13 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -44,15 +44,15 @@ inline void save( const unsigned int /*file_version*/ ){ boost::serialization::stl::save_unordered_collection< - Archive, + Archive, boost::unordered_map >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -65,7 +65,7 @@ inline void load( Archive, boost::unordered_map, boost::serialization::stl::archive_input_unordered_map< - Archive, + Archive, boost::unordered_map > >(ar, t); @@ -74,9 +74,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -90,9 +90,9 @@ inline void serialize( // unordered_multimap template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -102,15 +102,15 @@ inline void save( const unsigned int /*file_version*/ ){ boost::serialization::stl::save_unordered_collection< - Archive, + Archive, boost::unordered_multimap >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -125,7 +125,7 @@ inline void load( Archive, boost::unordered_multimap, boost::serialization::stl::archive_input_unordered_multimap< - Archive, + Archive, boost::unordered_multimap > >(ar, t); @@ -134,9 +134,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > diff --git a/include/boost/serialization/boost_unordered_set.hpp b/include/boost/serialization/boost_unordered_set.hpp index 307c7819..bd9d4769 100644 --- a/include/boost/serialization/boost_unordered_set.hpp +++ b/include/boost/serialization/boost_unordered_set.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // unordered_set.hpp: serialization for boost unordered_set templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -26,13 +26,13 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -42,15 +42,15 @@ inline void save( const unsigned int /*file_version*/ ){ boost::serialization::stl::save_unordered_collection< - Archive, + Archive, boost::unordered_set >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -63,7 +63,7 @@ inline void load( Archive, boost::unordered_set, boost::serialization::stl::archive_input_unordered_set< - Archive, + Archive, boost::unordered_set > >(ar, t); @@ -72,9 +72,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -88,9 +88,9 @@ inline void serialize( // unordered_multiset template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -100,15 +100,15 @@ inline void save( const unsigned int /*file_version*/ ){ boost::serialization::stl::save_unordered_collection< - Archive, + Archive, boost::unordered_multiset >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -130,9 +130,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > diff --git a/include/boost/serialization/collection_size_type.hpp b/include/boost/serialization/collection_size_type.hpp index 12707b46..9b6115ad 100644 --- a/include/boost/serialization/collection_size_type.hpp +++ b/include/boost/serialization/collection_size_type.hpp @@ -12,7 +12,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { //BOOST_STRONG_TYPEDEF(std::size_t, collection_size_type) @@ -23,34 +23,34 @@ private: base_type t; public: collection_size_type(): t(0) {} - explicit collection_size_type(const std::size_t & t_) : + explicit collection_size_type(const std::size_t & t_) : t(t_) {} - collection_size_type(const collection_size_type & t_) : + collection_size_type(const collection_size_type & t_) : t(t_.t) {} collection_size_type & operator=(const collection_size_type & rhs){ - t = rhs.t; + t = rhs.t; return *this; } collection_size_type & operator=(const unsigned int & rhs){ - t = rhs; + t = rhs; return *this; } // used for text output operator base_type () const { return t; - } + } // used for text input operator base_type & () { return t; - } + } bool operator==(const collection_size_type & rhs) const { return t == rhs.t; - } + } bool operator<(const collection_size_type & rhs) const { return t < rhs.t; - } + } }; diff --git a/include/boost/serialization/collection_traits.hpp b/include/boost/serialization/collection_traits.hpp index 3ec9401e..199d9418 100644 --- a/include/boost/serialization/collection_traits.hpp +++ b/include/boost/serialization/collection_traits.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // collection_traits.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/serialization/collections_load_imp.hpp b/include/boost/serialization/collections_load_imp.hpp index e042c0c1..aa934cc4 100644 --- a/include/boost/serialization/collections_load_imp.hpp +++ b/include/boost/serialization/collections_load_imp.hpp @@ -13,7 +13,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // collections_load_imp.hpp: serialization for loading stl collections -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -26,8 +26,8 @@ #include // size_t #include // msvc 6.0 needs this for warning suppression #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif #include @@ -99,7 +99,7 @@ collection_load_impl( } } -} // namespace stl +} // namespace stl } // namespace serialization } // namespace boost diff --git a/include/boost/serialization/collections_save_imp.hpp b/include/boost/serialization/collections_save_imp.hpp index 5ada155e..54162ed3 100644 --- a/include/boost/serialization/collections_save_imp.hpp +++ b/include/boost/serialization/collections_save_imp.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // collections_save_imp.hpp: serialization for stl collections -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -60,7 +60,7 @@ inline void save_collection( while(count-- > 0){ // note borland emits a no-op without the explicit namespace boost::serialization::save_construct_data_adl( - ar, + ar, boost::addressof(*it), item_version ); @@ -76,7 +76,7 @@ inline void save_collection(Archive & ar, const Container &s) save_collection(ar, s, count); } -} // namespace stl +} // namespace stl } // namespace serialization } // namespace boost diff --git a/include/boost/serialization/complex.hpp b/include/boost/serialization/complex.hpp index b4ef44cf..3de3be7e 100644 --- a/include/boost/serialization/complex.hpp +++ b/include/boost/serialization/complex.hpp @@ -10,7 +10,7 @@ // serialization/utility.hpp: // serialization for stl utility templates -// (C) Copyright 2007 Matthias Troyer . +// (C) Copyright 2007 Matthias Troyer . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -24,14 +24,14 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template inline void serialize( Archive & ar, std::complex< T > & t, - const unsigned int file_version + const unsigned int file_version ){ boost::serialization::split_free(ar, t, file_version); } @@ -52,7 +52,7 @@ template inline void load( Archive & ar, std::complex< T >& t, - const unsigned int /* file_version */ + const unsigned int /* file_version */ ){ T re; T im; diff --git a/include/boost/serialization/config.hpp b/include/boost/serialization/config.hpp index ea8cb923..0e3842ea 100644 --- a/include/boost/serialization/config.hpp +++ b/include/boost/serialization/config.hpp @@ -10,7 +10,7 @@ // See library home page at http://www.boost.org/libs/serialization -//----------------------------------------------------------------------------// +//----------------------------------------------------------------------------// // This header implements separate compilation features as described in // http://www.boost.org/more/separate_compilation.html @@ -18,7 +18,7 @@ #include #include -// note: this version incorporates the related code into the the +// note: this version incorporates the related code into the the // the same library as BOOST_ARCHIVE. This could change some day in the // future @@ -48,7 +48,7 @@ #define BOOST_SERIALIZATION_DECL #endif -// enable automatic library variant selection ------------------------------// +// enable automatic library variant selection ------------------------------// #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_SERIALIZATION_NO_LIB) \ && !defined(BOOST_ARCHIVE_SOURCE) && !defined(BOOST_WARCHIVE_SOURCE) \ @@ -69,6 +69,6 @@ // #include -#endif +#endif #endif // BOOST_SERIALIZATION_CONFIG_HPP diff --git a/include/boost/serialization/deque.hpp b/include/boost/serialization/deque.hpp index bba81364..15a85c92 100644 --- a/include/boost/serialization/deque.hpp +++ b/include/boost/serialization/deque.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // deque.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -26,7 +26,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template @@ -36,7 +36,7 @@ inline void save( const unsigned int /* file_version */ ){ boost::serialization::stl::save_collection< - Archive, std::deque + Archive, std::deque >(ar, t); } diff --git a/include/boost/serialization/detail/is_default_constructible.hpp b/include/boost/serialization/detail/is_default_constructible.hpp index 4d20b13b..f5a79512 100644 --- a/include/boost/serialization/detail/is_default_constructible.hpp +++ b/include/boost/serialization/detail/is_default_constructible.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // is_default_constructible.hpp: serialization for loading stl collections // -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/serialization/detail/shared_count_132.hpp b/include/boost/serialization/detail/shared_count_132.hpp index a5872557..f0972255 100644 --- a/include/boost/serialization/detail/shared_count_132.hpp +++ b/include/boost/serialization/detail/shared_count_132.hpp @@ -40,8 +40,8 @@ #include // msvc 6.0 needs this for warning suppression #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif @@ -357,7 +357,7 @@ public: template explicit shared_count(std::auto_ptr & r): pi_( new sp_counted_base_impl< - Y *, + Y *, boost::checked_deleter >(r.get(), boost::checked_deleter())) #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS) @@ -367,7 +367,7 @@ public: r.release(); } -#endif +#endif ~shared_count() // nothrow { diff --git a/include/boost/serialization/detail/shared_ptr_132.hpp b/include/boost/serialization/detail/shared_ptr_132.hpp index ee98b7b9..b73fa2b0 100644 --- a/include/boost/serialization/detail/shared_ptr_132.hpp +++ b/include/boost/serialization/detail/shared_ptr_132.hpp @@ -251,7 +251,7 @@ public: BOOST_ASSERT(px != 0); return px; } - + T * get() const // never throws { return px; @@ -268,13 +268,13 @@ public: #elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) typedef T * (this_type::*unspecified_bool_type)() const; - + operator unspecified_bool_type() const // never throws { return px == 0? 0: &this_type::get; } -#else +#else typedef T * this_type::*unspecified_bool_type; @@ -436,7 +436,7 @@ template D * get_deleter(shared_ptr< T > const & p) #ifdef BOOST_MSVC # pragma warning(pop) -#endif +#endif #endif // #if defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(BOOST_MSVC6_MEMBER_TEMPLATES) diff --git a/include/boost/serialization/detail/shared_ptr_nmt_132.hpp b/include/boost/serialization/detail/shared_ptr_nmt_132.hpp index 490e7ddd..8a909f09 100644 --- a/include/boost/serialization/detail/shared_ptr_nmt_132.hpp +++ b/include/boost/serialization/detail/shared_ptr_nmt_132.hpp @@ -92,10 +92,10 @@ public: #ifndef BOOST_NO_AUTO_PTR explicit shared_ptr(std::auto_ptr< T > & r) - { + { pn = new count_type(1); // may throw px = r.release(); // fix: moved here to stop leak if new throws - } + } shared_ptr & operator=(std::auto_ptr< T > & r) { @@ -137,7 +137,7 @@ public: { return *pn == 1; } - + void swap(shared_ptr< T > & other) // never throws { std::swap(px, other.px); diff --git a/include/boost/serialization/detail/stack_constructor.hpp b/include/boost/serialization/detail/stack_constructor.hpp index ae14832c..b545a283 100644 --- a/include/boost/serialization/detail/stack_constructor.hpp +++ b/include/boost/serialization/detail/stack_constructor.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // stack_constructor.hpp: serialization for loading stl collections -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,18 +25,18 @@ namespace detail { // reserve space on stack for an object of type T without actually // construction such an object -template +template struct stack_allocate { T * address() { - return static_cast(storage_.address()); + return static_cast(storage_.address()); } T & reference() { return * address(); } private: typedef typename boost::aligned_storage< - sizeof(T), + sizeof(T), boost::alignment_of::value > type; type storage_; @@ -49,8 +49,8 @@ struct stack_construct : public stack_allocate stack_construct(Archive & ar, const unsigned int version){ // note borland emits a no-op without the explicit namespace boost::serialization::load_construct_data_adl( - ar, - this->address(), + ar, + this->address(), version ); } diff --git a/include/boost/serialization/export.hpp b/include/boost/serialization/export.hpp index 00e85b18..2b856ea4 100644 --- a/include/boost/serialization/export.hpp +++ b/include/boost/serialization/export.hpp @@ -60,14 +60,14 @@ struct export_impl static const basic_pointer_iserializer & enable_load(mpl::true_){ return boost::serialization::singleton< - pointer_iserializer + pointer_iserializer >::get_const_instance(); } static const basic_pointer_oserializer & enable_save(mpl::true_){ return boost::serialization::singleton< - pointer_oserializer + pointer_oserializer >::get_const_instance(); } inline static void enable_load(mpl::false_) {} @@ -93,7 +93,7 @@ struct ptr_serialization_support }; template -BOOST_DLLEXPORT void +BOOST_DLLEXPORT void ptr_serialization_support::instantiate() { export_impl::enable_save( @@ -199,7 +199,7 @@ namespace { \ # define BOOST_SERIALIZATION_MWERKS_BASE_AND_DERIVED(Base,Derived) -#endif +#endif // check for unnecessary export. T isn't polymorphic so there is no // need to export it. diff --git a/include/boost/serialization/extended_type_info.hpp b/include/boost/serialization/extended_type_info.hpp index bb2a190d..d38af2a8 100644 --- a/include/boost/serialization/extended_type_info.hpp +++ b/include/boost/serialization/extended_type_info.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // extended_type_info.hpp: interface for portable version of type_info -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -34,7 +34,7 @@ #define BOOST_SERIALIZATION_MAX_KEY_SIZE 128 -namespace boost { +namespace boost { namespace serialization { namespace void_cast_detail{ @@ -58,7 +58,7 @@ private: protected: BOOST_SERIALIZATION_DECL void key_unregister() const; BOOST_SERIALIZATION_DECL void key_register() const; - // this class can't be used as is. It's just the + // this class can't be used as is. It's just the // common functionality for all type_info replacement // systems. Hence, make these protected BOOST_SERIALIZATION_DECL extended_type_info( @@ -104,7 +104,7 @@ inline const char * guid(){ return ext::guid_impl::call(); } -} // namespace serialization +} // namespace serialization } // namespace boost #ifdef BOOST_MSVC diff --git a/include/boost/serialization/extended_type_info_no_rtti.hpp b/include/boost/serialization/extended_type_info_no_rtti.hpp index aaa8b444..f5b481a1 100644 --- a/include/boost/serialization/extended_type_info_no_rtti.hpp +++ b/include/boost/serialization/extended_type_info_no_rtti.hpp @@ -11,7 +11,7 @@ // on runtime typing (rtti - typeid) but uses a user specified string // as the portable class identifier. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -50,7 +50,7 @@ namespace serialization { namespace no_rtti_system { -// common base class to share type_info_key. This is used to +// common base class to share type_info_key. This is used to // identify the method used to keep track of the extended type class BOOST_SYMBOL_VISIBLE extended_type_info_no_rtti_0 : public extended_type_info @@ -68,7 +68,7 @@ public: } // no_rtti_system template -class extended_type_info_no_rtti : +class extended_type_info_no_rtti : public no_rtti_system::extended_type_info_no_rtti_0, public singleton > { @@ -80,7 +80,7 @@ class extended_type_info_no_rtti : } }; struct undefined { - // if your program traps here - you failed to + // if your program traps here - you failed to // export a guid for this type. the no_rtti // system requires export for types serialized // as pointers. @@ -88,7 +88,7 @@ class extended_type_info_no_rtti : static const char * invoke(); }; static const char * invoke(){ - typedef + typedef typename boost::mpl::if_c< tf, defined, @@ -157,7 +157,7 @@ public: } // namespace boost /////////////////////////////////////////////////////////////////////////////// -// If no other implementation has been designated as default, +// If no other implementation has been designated as default, // use this one. To use this implementation as the default, specify it // before any of the other headers. @@ -167,7 +167,7 @@ public: namespace serialization { template struct extended_type_info_impl { - typedef typename + typedef typename boost::serialization::extended_type_info_no_rtti< T > type; }; } // namespace serialization diff --git a/include/boost/serialization/extended_type_info_typeid.hpp b/include/boost/serialization/extended_type_info_typeid.hpp index 8ee591b3..50023463 100644 --- a/include/boost/serialization/extended_type_info_typeid.hpp +++ b/include/boost/serialization/extended_type_info_typeid.hpp @@ -11,7 +11,7 @@ // on runtime typing (rtti - typeid) but uses a user specified string // as the portable class identifier. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -78,7 +78,7 @@ public: } // typeid_system template -class extended_type_info_typeid : +class extended_type_info_typeid : public typeid_system::extended_type_info_typeid_0, public singleton > { @@ -102,7 +102,7 @@ public: // note: this implementation - based on usage of typeid (rtti) // only does something if the class has at least one virtual function. BOOST_STATIC_WARNING(boost::is_polymorphic< T >::value); - return + return typeid_system::extended_type_info_typeid_0::get_extended_type_info( typeid(t) ); @@ -143,7 +143,7 @@ public: } // namespace boost /////////////////////////////////////////////////////////////////////////////// -// If no other implementation has been designated as default, +// If no other implementation has been designated as default, // use this one. To use this implementation as the default, specify it // before any of the other headers. #ifndef BOOST_SERIALIZATION_DEFAULT_TYPE_INFO @@ -152,7 +152,7 @@ public: namespace serialization { template struct extended_type_info_impl { - typedef typename + typedef typename boost::serialization::extended_type_info_typeid< T > type; }; } // namespace serialization diff --git a/include/boost/serialization/factory.hpp b/include/boost/serialization/factory.hpp index 2db7e7e3..9489bc82 100644 --- a/include/boost/serialization/factory.hpp +++ b/include/boost/serialization/factory.hpp @@ -9,7 +9,7 @@ // factory.hpp: create an instance from an extended_type_info instance. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -19,7 +19,7 @@ #include // valist #include // NULL -#include +#include #include #include diff --git a/include/boost/serialization/force_include.hpp b/include/boost/serialization/force_include.hpp index 55ab79d0..a418b0ec 100644 --- a/include/boost/serialization/force_include.hpp +++ b/include/boost/serialization/force_include.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // force_include.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/serialization/forward_list.hpp b/include/boost/serialization/forward_list.hpp index b8a3c20a..fc694152 100644 --- a/include/boost/serialization/forward_list.hpp +++ b/include/boost/serialization/forward_list.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // forward_list.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,7 +32,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template diff --git a/include/boost/serialization/hash_collections_load_imp.hpp b/include/boost/serialization/hash_collections_load_imp.hpp index 88def8f1..1a2417e8 100644 --- a/include/boost/serialization/hash_collections_load_imp.hpp +++ b/include/boost/serialization/hash_collections_load_imp.hpp @@ -10,7 +10,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // hash_collections_load_imp.hpp: serialization for loading stl collections -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -70,7 +70,7 @@ inline void load_hash_collection(Archive & ar, Container &s) } } -} // namespace stl +} // namespace stl } // namespace serialization } // namespace boost diff --git a/include/boost/serialization/hash_collections_save_imp.hpp b/include/boost/serialization/hash_collections_save_imp.hpp index 65dfe83f..f9209f1e 100644 --- a/include/boost/serialization/hash_collections_save_imp.hpp +++ b/include/boost/serialization/hash_collections_save_imp.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // hash_collections_save_imp.hpp: serialization for stl collections -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -80,8 +80,8 @@ inline void save_hash_collection(Archive & ar, const Container &s) while(count-- > 0){ // note borland emits a no-op without the explicit namespace boost::serialization::save_construct_data_adl( - ar, - &(*it), + ar, + &(*it), boost::serialization::version< typename Container::value_type >::value @@ -90,7 +90,7 @@ inline void save_hash_collection(Archive & ar, const Container &s) } } -} // namespace stl +} // namespace stl } // namespace serialization } // namespace boost diff --git a/include/boost/serialization/hash_map.hpp b/include/boost/serialization/hash_map.hpp index 22626db6..18d4168f 100644 --- a/include/boost/serialization/hash_map.hpp +++ b/include/boost/serialization/hash_map.hpp @@ -10,7 +10,7 @@ // serialization/hash_map.hpp: // serialization for stl hash_map templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -27,7 +27,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { namespace stl { @@ -37,19 +37,19 @@ template struct archive_input_hash_map { inline void operator()( - Archive &ar, - Container &s, + Archive &ar, + Container &s, const unsigned int v ){ typedef typename Container::value_type type; detail::stack_construct t(ar, v); // borland fails silently w/o full namespace ar >> boost::serialization::make_nvp("item", t.reference()); - std::pair result = + std::pair result = s.insert(boost::move(t.reference())); // note: the following presumes that the map::value_type was NOT tracked // in the archive. This is the usual case, but here there is no way - // to determine that. + // to determine that. if(result.second){ ar.reset_object_address( & (result.first->second), @@ -64,19 +64,19 @@ template struct archive_input_hash_multimap { inline void operator()( - Archive &ar, - Container &s, + Archive &ar, + Container &s, const unsigned int v ){ typedef typename Container::value_type type; detail::stack_construct t(ar, v); // borland fails silently w/o full namespace ar >> boost::serialization::make_nvp("item", t.reference()); - typename Container::const_iterator result + typename Container::const_iterator result = s.insert(boost::move(t.reference())); // note: the following presumes that the map::value_type was NOT tracked // in the archive. This is the usual case, but here there is no way - // to determine that. + // to determine that. ar.reset_object_address( & result->second, & t.reference() @@ -87,9 +87,9 @@ struct archive_input_hash_multimap } // stl template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -101,7 +101,7 @@ inline void save( const unsigned int file_version ){ boost::serialization::stl::save_hash_collection< - Archive, + Archive, BOOST_STD_EXTENSION_NAMESPACE::hash_map< Key, HashFcn, EqualKey, Allocator > @@ -109,9 +109,9 @@ inline void save( } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -128,7 +128,7 @@ inline void load( Key, HashFcn, EqualKey, Allocator >, boost::serialization::stl::archive_input_hash_map< - Archive, + Archive, BOOST_STD_EXTENSION_NAMESPACE::hash_map< Key, HashFcn, EqualKey, Allocator > @@ -139,9 +139,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -157,9 +157,9 @@ inline void serialize( // hash_multimap template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -171,7 +171,7 @@ inline void save( const unsigned int file_version ){ boost::serialization::stl::save_hash_collection< - Archive, + Archive, BOOST_STD_EXTENSION_NAMESPACE::hash_multimap< Key, HashFcn, EqualKey, Allocator > @@ -179,9 +179,9 @@ inline void save( } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -198,7 +198,7 @@ inline void load( Key, HashFcn, EqualKey, Allocator >, boost::serialization::stl::archive_input_hash_multimap< - Archive, + Archive, BOOST_STD_EXTENSION_NAMESPACE::hash_multimap< Key, HashFcn, EqualKey, Allocator > @@ -209,9 +209,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > diff --git a/include/boost/serialization/hash_set.hpp b/include/boost/serialization/hash_set.hpp index 0c72c184..5a55e697 100644 --- a/include/boost/serialization/hash_set.hpp +++ b/include/boost/serialization/hash_set.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // hash_set.hpp: serialization for stl hash_set templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { namespace stl { @@ -35,15 +35,15 @@ template struct archive_input_hash_set { inline void operator()( - Archive &ar, - Container &s, + Archive &ar, + Container &s, const unsigned int v ){ typedef typename Container::value_type type; detail::stack_construct t(ar, v); // borland fails silently w/o full namespace ar >> boost::serialization::make_nvp("item", t.reference()); - std::pair result = + std::pair result = s.insert(boost::move(t.reference())); if(result.second) ar.reset_object_address(& (* result.first), & t.reference()); @@ -55,15 +55,15 @@ template struct archive_input_hash_multiset { inline void operator()( - Archive &ar, - Container &s, + Archive &ar, + Container &s, const unsigned int v ){ typedef typename Container::value_type type; detail::stack_construct t(ar, v); // borland fails silently w/o full namespace ar >> boost::serialization::make_nvp("item", t.reference()); - typename Container::const_iterator result + typename Container::const_iterator result = s.insert(boost::move(t.reference())); ar.reset_object_address(& (* result), & t.reference()); } @@ -72,9 +72,9 @@ struct archive_input_hash_multiset } // stl template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -86,17 +86,17 @@ inline void save( const unsigned int file_version ){ boost::serialization::stl::save_hash_collection< - Archive, + Archive, BOOST_STD_EXTENSION_NAMESPACE::hash_set< Key, HashFcn, EqualKey, Allocator - > + > >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -113,7 +113,7 @@ inline void load( Key, HashFcn, EqualKey, Allocator >, boost::serialization::stl::archive_input_hash_set< - Archive, + Archive, BOOST_STD_EXTENSION_NAMESPACE::hash_set< Key, HashFcn, EqualKey, Allocator > @@ -124,9 +124,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -142,9 +142,9 @@ inline void serialize( // hash_multiset template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -156,17 +156,17 @@ inline void save( const unsigned int file_version ){ boost::serialization::stl::save_hash_collection< - Archive, + Archive, BOOST_STD_EXTENSION_NAMESPACE::hash_multiset< Key, HashFcn, EqualKey, Allocator - > + > >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -186,7 +186,7 @@ inline void load( Archive, BOOST_STD_EXTENSION_NAMESPACE::hash_multiset< Key, HashFcn, EqualKey, Allocator - > + > > >(ar, t); } @@ -194,9 +194,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > diff --git a/include/boost/serialization/item_version_type.hpp b/include/boost/serialization/item_version_type.hpp index f3e5adac..544602ca 100644 --- a/include/boost/serialization/item_version_type.hpp +++ b/include/boost/serialization/item_version_type.hpp @@ -14,7 +14,7 @@ // fixes broken example build on x86_64-linux-gnu-gcc-4.6.0 #include -namespace boost { +namespace boost { namespace serialization { #if defined(_MSC_VER) @@ -32,24 +32,24 @@ public: explicit item_version_type(const unsigned int t_) : t(t_){ BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } - item_version_type(const item_version_type & t_) : + item_version_type(const item_version_type & t_) : t(t_.t) {} item_version_type & operator=(item_version_type rhs){ - t = rhs.t; + t = rhs.t; return *this; } // used for text output operator base_type () const { return t; - } + } // used for text input operator base_type & () { return t; } bool operator==(const item_version_type & rhs) const { return t == rhs.t; - } + } bool operator<(const item_version_type & rhs) const { return t < rhs.t; } diff --git a/include/boost/serialization/level.hpp b/include/boost/serialization/level.hpp index f6a84d10..13cf05b9 100644 --- a/include/boost/serialization/level.hpp +++ b/include/boost/serialization/level.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // level.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -80,7 +80,7 @@ struct implementation_level_impl { }; template -struct implementation_level : +struct implementation_level : public implementation_level_impl { }; diff --git a/include/boost/serialization/level_enum.hpp b/include/boost/serialization/level_enum.hpp index baf64e04..965b46f8 100644 --- a/include/boost/serialization/level_enum.hpp +++ b/include/boost/serialization/level_enum.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // level_enum.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -37,12 +37,12 @@ enum level_type primitive_type = 1, // Serialize the objects of this type using the objects "serialize" // function or template. This permits values to be written/read - // to/from archives but includes no class or version information. + // to/from archives but includes no class or version information. object_serializable = 2, /////////////////////////////////////////////////////////////////// // once an object is serialized at one of the above levels, the // corresponding archives cannot be read if the implementation level - // for the archive object is changed. + // for the archive object is changed. /////////////////////////////////////////////////////////////////// // Add class information to the archive. Class information includes // implementation level, class version and class name if available diff --git a/include/boost/serialization/list.hpp b/include/boost/serialization/list.hpp index 5fdc114d..c4e36741 100644 --- a/include/boost/serialization/list.hpp +++ b/include/boost/serialization/list.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // list.hpp: serialization for stl list templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -30,7 +30,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template @@ -40,8 +40,8 @@ inline void save( const unsigned int /* file_version */ ){ boost::serialization::stl::save_collection< - Archive, - std::list + Archive, + std::list >(ar, t); } diff --git a/include/boost/serialization/map.hpp b/include/boost/serialization/map.hpp index 9209864c..6c6f7677 100644 --- a/include/boost/serialization/map.hpp +++ b/include/boost/serialization/map.hpp @@ -10,7 +10,7 @@ // serialization/map.hpp: // serialization for stl map templates -// (C) Copyright 2002-2014 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-2014 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -33,7 +33,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { ////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 @@ -75,8 +75,8 @@ inline void save( const unsigned int /* file_version */ ){ boost::serialization::stl::save_collection< - Archive, - std::map + Archive, + std::map >(ar, t); } @@ -108,8 +108,8 @@ inline void save( const unsigned int /* file_version */ ){ boost::serialization::stl::save_collection< - Archive, - std::multimap + Archive, + std::multimap >(ar, t); } diff --git a/include/boost/serialization/nvp.hpp b/include/boost/serialization/nvp.hpp index 0fe66dd6..88cecc8b 100644 --- a/include/boost/serialization/nvp.hpp +++ b/include/boost/serialization/nvp.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // nvp.hpp: interface for serialization system. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/serialization/optional.hpp b/include/boost/serialization/optional.hpp index d6ff830a..22d7db50 100644 --- a/include/boost/serialization/optional.hpp +++ b/include/boost/serialization/optional.hpp @@ -1,6 +1,6 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// (C) Copyright 2002-4 Pavel Vozenilek . +// (C) Copyright 2002-4 Pavel Vozenilek . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -33,13 +33,13 @@ // function specializations must be defined in the appropriate // namespace - boost::serialization -namespace boost { +namespace boost { namespace serialization { template void save( - Archive & ar, - const boost::optional< T > & t, + Archive & ar, + const boost::optional< T > & t, const unsigned int /*version*/ ){ // It is an inherent limitation to the serialization of optional.hpp @@ -62,8 +62,8 @@ void save( template void load( - Archive & ar, - boost::optional< T > & t, + Archive & ar, + boost::optional< T > & t, const unsigned int version ){ bool tflag; @@ -89,8 +89,8 @@ void load( template void serialize( - Archive & ar, - boost::optional< T > & t, + Archive & ar, + boost::optional< T > & t, const unsigned int version ){ boost::serialization::split_free(ar, t, version); diff --git a/include/boost/serialization/priority_queue.hpp b/include/boost/serialization/priority_queue.hpp index 5b08ffd1..afbd472c 100644 --- a/include/boost/serialization/priority_queue.hpp +++ b/include/boost/serialization/priority_queue.hpp @@ -29,7 +29,7 @@ #define STD std #endif -namespace boost { +namespace boost { namespace serialization { namespace detail{ @@ -54,7 +54,7 @@ template inline void serialize( Archive & ar, std::priority_queue< T, Container, Compare> & t, - const unsigned int file_version + const unsigned int file_version ){ typedef typename mpl::eval_if< typename Archive::is_saving, diff --git a/include/boost/serialization/queue.hpp b/include/boost/serialization/queue.hpp index b2274521..65ba572a 100644 --- a/include/boost/serialization/queue.hpp +++ b/include/boost/serialization/queue.hpp @@ -29,7 +29,7 @@ #define STD std #endif -namespace boost { +namespace boost { namespace serialization { namespace detail { @@ -54,7 +54,7 @@ template inline void serialize( Archive & ar, std::queue< T, C> & t, - const unsigned int file_version + const unsigned int file_version ){ typedef typename mpl::eval_if< typename Archive::is_saving, diff --git a/include/boost/serialization/scoped_ptr.hpp b/include/boost/serialization/scoped_ptr.hpp index 0d11f843..3f92becf 100644 --- a/include/boost/serialization/scoped_ptr.hpp +++ b/include/boost/serialization/scoped_ptr.hpp @@ -19,13 +19,13 @@ #include #include -namespace boost { +namespace boost { namespace serialization { - + template void save( - Archive & ar, - const boost::scoped_ptr< T > & t, + Archive & ar, + const boost::scoped_ptr< T > & t, const unsigned int /* version */ ){ T* r = t.get(); @@ -34,19 +34,19 @@ namespace serialization { template void load( - Archive & ar, - boost::scoped_ptr< T > & t, + Archive & ar, + boost::scoped_ptr< T > & t, const unsigned int /* version */ ){ T* r; ar >> boost::serialization::make_nvp("scoped_ptr", r); - t.reset(r); + t.reset(r); } template void serialize( - Archive& ar, - boost::scoped_ptr< T >& t, + Archive& ar, + boost::scoped_ptr< T >& t, const unsigned int version ){ boost::serialization::split_free(ar, t, version); diff --git a/include/boost/serialization/serialization.hpp b/include/boost/serialization/serialization.hpp index a4d04723..df0c1419 100644 --- a/include/boost/serialization/serialization.hpp +++ b/include/boost/serialization/serialization.hpp @@ -16,7 +16,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // serialization.hpp: interface for serialization system. -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -24,7 +24,7 @@ // See http://www.boost.org for updates, documentation, and revision history. ////////////////////////////////////////////////////////////////////// -// public interface to serialization. +// public interface to serialization. ///////////////////////////////////////////////////////////////////////////// // layer 0 - intrusive verison @@ -46,13 +46,13 @@ // layer 2 - default implementation of non-intrusive serialization. // // note the usage of function overloading to compensate that C++ does not -// currently support Partial Template Specialization for function templates -// We have declared the version number as "const unsigned long". +// currently support Partial Template Specialization for function templates +// We have declared the version number as "const unsigned long". // Overriding templates for specific data types should declare the version // number as "const unsigned int". Template matching will first be applied -// to functions with the same version types - that is the overloads. +// to functions with the same version types - that is the overloads. // If there is no declared function prototype that matches, the second argument -// will be converted to "const unsigned long" and a match will be made with +// will be converted to "const unsigned long" and a match will be made with // one of the default template functions below. namespace boost { @@ -71,8 +71,8 @@ inline void serialize( // save data required for construction template inline void save_construct_data( - Archive & /*ar*/, - const T * /*t*/, + Archive & /*ar*/, + const T * /*t*/, const unsigned int /*file_version */ ){ // default is to save no data because default constructor @@ -82,8 +82,8 @@ inline void save_construct_data( // load data required for construction and invoke constructor in place template inline void load_construct_data( - Archive & /*ar*/, - T * t, + Archive & /*ar*/, + T * t, const unsigned int /*file_version*/ ){ // default just uses the default constructor. going @@ -98,10 +98,10 @@ inline void load_construct_data( // // on compilers which don't implement ADL. only the current namespace // i.e. boost::serialization will be searched. -// +// // on compilers which DO implement ADL // serialize overrides can be in any of the following -// +// // 1) same namepace as Archive // 2) same namespace as T // 3) boost::serialization @@ -110,8 +110,8 @@ inline void load_construct_data( template inline void serialize_adl( - Archive & ar, - T & t, + Archive & ar, + T & t, const unsigned int file_version ){ // note usage of function overloading to delay final resolution @@ -128,8 +128,8 @@ inline void serialize_adl( template inline void save_construct_data_adl( - Archive & ar, - const T * t, + Archive & ar, + const T * t, const unsigned int file_version ){ // see above @@ -139,8 +139,8 @@ inline void save_construct_data_adl( template inline void load_construct_data_adl( - Archive & ar, - T * t, + Archive & ar, + T * t, const unsigned int file_version ){ // see above comment diff --git a/include/boost/serialization/set.hpp b/include/boost/serialization/set.hpp index dd201267..803e8258 100644 --- a/include/boost/serialization/set.hpp +++ b/include/boost/serialization/set.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // set.hpp: serialization for stl set templates -// (C) Copyright 2002-2014 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-2014 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -31,7 +31,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template @@ -70,7 +70,7 @@ inline void save( const unsigned int /* file_version */ ){ boost::serialization::stl::save_collection< - Archive, std::set + Archive, std::set >(ar, t); } @@ -102,8 +102,8 @@ inline void save( const unsigned int /* file_version */ ){ boost::serialization::stl::save_collection< - Archive, - std::multiset + Archive, + std::multiset >(ar, t); } diff --git a/include/boost/serialization/shared_ptr.hpp b/include/boost/serialization/shared_ptr.hpp index 0d4c5ae6..d1eb75c8 100644 --- a/include/boost/serialization/shared_ptr.hpp +++ b/include/boost/serialization/shared_ptr.hpp @@ -52,7 +52,7 @@ }; // don't track shared pointers template - struct tracking_level< ::boost::shared_ptr< T > > { + struct tracking_level< ::boost::shared_ptr< T > > { typedef mpl::integral_c_tag tag; #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3206)) typedef typename mpl::int_< ::boost::serialization::track_never> type; @@ -160,7 +160,7 @@ inline void load( ar.template get_helper >( shared_ptr_helper_id ); - h.reset(t,r); + h.reset(t,r); } #endif @@ -207,7 +207,7 @@ namespace serialization{ }; // don't track shared pointers template - struct tracking_level< ::std::shared_ptr< T > > { + struct tracking_level< ::std::shared_ptr< T > > { typedef mpl::integral_c_tag tag; typedef mpl::int_< ::boost::serialization::track_never> type; BOOST_STATIC_CONSTANT(int, value = type::value); diff --git a/include/boost/serialization/shared_ptr_132.hpp b/include/boost/serialization/shared_ptr_132.hpp index 3dfaba4d..43a89c5d 100644 --- a/include/boost/serialization/shared_ptr_132.hpp +++ b/include/boost/serialization/shared_ptr_132.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // shared_ptr.hpp: serialization for boost shared pointer -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -38,7 +38,7 @@ // Maintain a couple of lists of loaded shared pointers of the old previous // version (1.32) -namespace boost_132 { +namespace boost_132 { namespace serialization { namespace detail { @@ -53,7 +53,7 @@ struct null_deleter { ///////////////////////////////////////////////////////////// // sp_counted_base_impl serialization -namespace boost { +namespace boost { namespace serialization { template @@ -66,7 +66,7 @@ inline void serialize( // its polymorphic base boost::serialization::void_cast_register< boost_132::detail::sp_counted_base_impl, - boost_132::detail::sp_counted_base + boost_132::detail::sp_counted_base >( static_cast *>(NULL), static_cast(NULL) @@ -76,8 +76,8 @@ inline void serialize( template inline void save_construct_data( Archive & ar, - const - boost_132::detail::sp_counted_base_impl *t, + const + boost_132::detail::sp_counted_base_impl *t, const unsigned int /* file_version */ ){ // variables used for construction @@ -87,25 +87,25 @@ inline void save_construct_data( template inline void load_construct_data( Archive & ar, - boost_132::detail::sp_counted_base_impl * t, + boost_132::detail::sp_counted_base_impl * t, const unsigned int /* file_version */ ){ P ptr_; ar >> boost::serialization::make_nvp("ptr", ptr_); - // ::new(t)boost_132::detail::sp_counted_base_impl(ptr_, D()); + // ::new(t)boost_132::detail::sp_counted_base_impl(ptr_, D()); // placement // note: the original ::new... above is replaced by the one here. This one // creates all new objects with a null_deleter so that after the archive // is finished loading and the shared_ptrs are destroyed - the underlying - // raw pointers are NOT deleted. This is necessary as they are used by the + // raw pointers are NOT deleted. This is necessary as they are used by the // new system as well. ::new(t)boost_132::detail::sp_counted_base_impl< - P, + P, boost_132::serialization::detail::null_deleter >( ptr_, boost_132::serialization::detail::null_deleter() ); // placement new - // compensate for that fact that a new shared count always is + // compensate for that fact that a new shared count always is // initialized with one. the add_ref_copy below will increment it // every time its serialized so without this adjustment // the use and weak counts will be off by one. @@ -118,7 +118,7 @@ inline void load_construct_data( ///////////////////////////////////////////////////////////// // shared_count serialization -namespace boost { +namespace boost { namespace serialization { template @@ -149,7 +149,7 @@ BOOST_SERIALIZATION_SPLIT_FREE(boost_132::detail::shared_count) ///////////////////////////////////////////////////////////// // implement serialization for shared_ptr< T > -namespace boost { +namespace boost { namespace serialization { template @@ -200,7 +200,7 @@ inline void serialize( } // serialization } // namespace boost -// note: change below uses null_deleter +// note: change below uses null_deleter // This macro is used to export GUIDS for shared pointers to allow // the serialization system to export them properly. David Tonge #define BOOST_SHARED_POINTER_EXPORT_GUID(T, K) \ diff --git a/include/boost/serialization/shared_ptr_helper.hpp b/include/boost/serialization/shared_ptr_helper.hpp index 37c34d6b..ba9a07a0 100644 --- a/include/boost/serialization/shared_ptr_helper.hpp +++ b/include/boost/serialization/shared_ptr_helper.hpp @@ -101,20 +101,20 @@ public: struct non_polymorphic { template - static const boost::serialization::extended_type_info * + static const boost::serialization::extended_type_info * get_object_type(U & ){ return & boost::serialization::singleton< - typename + typename boost::serialization::type_info_implementation< U >::type >::get_const_instance(); } }; struct polymorphic { template - static const boost::serialization::extended_type_info * + static const boost::serialization::extended_type_info * get_object_type(U & u){ return boost::serialization::singleton< - typename + typename boost::serialization::type_info_implementation< U >::type >::get_const_instance().get_derived_extended_type_info(u); } diff --git a/include/boost/serialization/slist.hpp b/include/boost/serialization/slist.hpp index d9b971bc..a155b788 100644 --- a/include/boost/serialization/slist.hpp +++ b/include/boost/serialization/slist.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // slist.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -31,7 +31,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template @@ -42,7 +42,7 @@ inline void save( ){ boost::serialization::stl::save_collection< Archive, - BOOST_STD_EXTENSION_NAMESPACE::slist + BOOST_STD_EXTENSION_NAMESPACE::slist >(ar, t); } diff --git a/include/boost/serialization/smart_cast.hpp b/include/boost/serialization/smart_cast.hpp index 563f36aa..701a417c 100644 --- a/include/boost/serialization/smart_cast.hpp +++ b/include/boost/serialization/smart_cast.hpp @@ -9,18 +9,18 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // smart_cast.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/serialization for updates, documentation, and revision history. -// casting of pointers and references. +// casting of pointers and references. // In casting between different C++ classes, there are a number of // rules that have to be kept in mind in deciding whether to use -// static_cast or dynamic_cast. +// static_cast or dynamic_cast. // a) dynamic casting can only be applied when one of the types is polymorphic // Otherwise static_cast must be used. @@ -136,7 +136,7 @@ namespace smart_cast_impl { struct pointer { struct polymorphic { - // unfortunately, this below fails to work for virtual base + // unfortunately, this below fails to work for virtual base // classes. need has_virtual_base to do this. // Subject for further study #if 0 @@ -220,7 +220,7 @@ namespace smart_cast_impl { template struct error { // if we get here, its because we are using one argument in the - // cast on a system which doesn't support partial template + // cast on a system which doesn't support partial template // specialization template static T cast(U){ diff --git a/include/boost/serialization/split_free.hpp b/include/boost/serialization/split_free.hpp index 85e2f590..9de2e927 100644 --- a/include/boost/serialization/split_free.hpp +++ b/include/boost/serialization/split_free.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // split_free.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -35,8 +35,8 @@ namespace serialization { template struct free_saver { static void invoke( - Archive & ar, - const T & t, + Archive & ar, + const T & t, const unsigned int file_version ){ // use function overload (version_type) to workaround @@ -48,8 +48,8 @@ struct free_saver { template struct free_loader { static void invoke( - Archive & ar, - T & t, + Archive & ar, + T & t, const unsigned int file_version ){ // use function overload (version_type) to workaround @@ -62,13 +62,13 @@ struct free_loader { template inline void split_free( - Archive & ar, - T & t, + Archive & ar, + T & t, const unsigned int file_version ){ typedef typename mpl::eval_if< typename Archive::is_saving, - mpl::identity >, + mpl::identity >, mpl::identity > >::type typex; typex::invoke(ar, t, file_version); diff --git a/include/boost/serialization/split_member.hpp b/include/boost/serialization/split_member.hpp index 5f325205..c6a59f1b 100644 --- a/include/boost/serialization/split_member.hpp +++ b/include/boost/serialization/split_member.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // split_member.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -36,7 +36,7 @@ namespace detail { template struct member_saver { static void invoke( - Archive & ar, + Archive & ar, const T & t, const unsigned int file_version ){ @@ -47,7 +47,7 @@ namespace detail { template struct member_loader { static void invoke( - Archive & ar, + Archive & ar, T & t, const unsigned int file_version ){ @@ -63,7 +63,7 @@ inline void split_member( ){ typedef typename mpl::eval_if< typename Archive::is_saving, - mpl::identity >, + mpl::identity >, mpl::identity > >::type typex; typex::invoke(ar, t, file_version); diff --git a/include/boost/serialization/stack.hpp b/include/boost/serialization/stack.hpp index 96f90fe8..6c829b71 100644 --- a/include/boost/serialization/stack.hpp +++ b/include/boost/serialization/stack.hpp @@ -29,7 +29,7 @@ #define STD std #endif -namespace boost { +namespace boost { namespace serialization { namespace detail{ @@ -54,7 +54,7 @@ template inline void serialize( Archive & ar, std::stack< T, C> & t, - const unsigned int file_version + const unsigned int file_version ){ typedef typename mpl::eval_if< typename Archive::is_saving, diff --git a/include/boost/serialization/state_saver.hpp b/include/boost/serialization/state_saver.hpp index 248b8d91..f67f79b7 100644 --- a/include/boost/serialization/state_saver.hpp +++ b/include/boost/serialization/state_saver.hpp @@ -59,8 +59,8 @@ private: static void invoke(T & previous_ref, const T & previous_value){ BOOST_TRY{ previous_ref = previous_value; - } - BOOST_CATCH(::std::exception &) { + } + BOOST_CATCH(::std::exception &) { // we must ignore it - we are in destructor } BOOST_CATCH_END @@ -70,11 +70,11 @@ private: public: state_saver( T & object - ) : + ) : previous_value(object), - previous_ref(object) + previous_ref(object) {} - + ~state_saver() { #ifndef BOOST_NO_EXCEPTIONS typedef typename mpl::eval_if< diff --git a/include/boost/serialization/static_warning.hpp b/include/boost/serialization/static_warning.hpp index 1d9238fc..a1b6899e 100644 --- a/include/boost/serialization/static_warning.hpp +++ b/include/boost/serialization/static_warning.hpp @@ -16,7 +16,7 @@ /* Revision history: 15 June 2003 - Initial version. - 31 March 2004 - improved diagnostic messages and portability + 31 March 2004 - improved diagnostic messages and portability (Jonathan Turkanis) 03 April 2004 - works on VC6 at class and namespace scope - ported to DigitalMars @@ -49,8 +49,8 @@ // 3. static_warning_impl::type overloads operator& to return a dynamically // allocated int pointer only is B is true, so returning the address of an // automatic variable of this type generates a warning iff B is fasle. -// 4. static_warning_impl::STATIC_WARNING is decalred as a struct iff B is -// false. +// 4. static_warning_impl::STATIC_WARNING is decalred as a struct iff B is +// false. // 5. static_warning_impl::type is incomplete iff B is false, so deleting a // pointer to this type generates a warning iff B is false. // @@ -72,7 +72,7 @@ namespace boost { namespace serialization { -template +template struct BOOST_SERIALIZATION_STATIC_WARNING_LINE{}; template @@ -97,7 +97,7 @@ struct BOOST_SERIALIZATION_SS {}; #define BOOST_SERIALIZATION_BSW(B, L) \ typedef boost::serialization::BOOST_SERIALIZATION_SS< \ sizeof( boost::serialization::static_warning_test< B, L > ) \ - > BOOST_JOIN(STATIC_WARNING_LINE, L) BOOST_ATTRIBUTE_UNUSED; + > BOOST_JOIN(STATIC_WARNING_LINE, L) BOOST_ATTRIBUTE_UNUSED; #define BOOST_STATIC_WARNING(B) BOOST_SERIALIZATION_BSW(B, __LINE__) #endif // BOOST_SERIALIZATION_STATIC_WARNING_HPP diff --git a/include/boost/serialization/string.hpp b/include/boost/serialization/string.hpp index 76e695d4..edcbd4b1 100644 --- a/include/boost/serialization/string.hpp +++ b/include/boost/serialization/string.hpp @@ -10,7 +10,7 @@ // serialization/string.hpp: // serialization for stl string templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/serialization/strong_typedef.hpp b/include/boost/serialization/strong_typedef.hpp index fdd1b24c..2770ae45 100644 --- a/include/boost/serialization/strong_typedef.hpp +++ b/include/boost/serialization/strong_typedef.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // strong_typedef.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2016 Ashish Sadanandan // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/boost/serialization/tracking.hpp b/include/boost/serialization/tracking.hpp index d5c79b84..89334074 100644 --- a/include/boost/serialization/tracking.hpp +++ b/include/boost/serialization/tracking.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // tracking.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -60,7 +60,7 @@ struct tracking_level_impl { // for primitives typename mpl::equal_to< implementation_level< T >, - mpl::int_ + mpl::int_ >, // is never mpl::int_, @@ -71,7 +71,7 @@ struct tracking_level_impl { }; template -struct tracking_level : +struct tracking_level : public tracking_level_impl { }; @@ -86,10 +86,10 @@ inline bool operator>=(tracking_level< T > t, enum tracking_type l) } // namespace boost -// The STATIC_ASSERT is prevents one from setting tracking for a primitive type. -// This almost HAS to be an error. Doing this will effect serialization of all -// char's in your program which is almost certainly what you don't want to do. -// If you want to track all instances of a given primitive type, You'll have to +// The STATIC_ASSERT is prevents one from setting tracking for a primitive type. +// This almost HAS to be an error. Doing this will effect serialization of all +// char's in your program which is almost certainly what you don't want to do. +// If you want to track all instances of a given primitive type, You'll have to // wrap it in your own type so its not a primitive anymore. Then it will compile // without problem. #define BOOST_CLASS_TRACKING(T, E) \ diff --git a/include/boost/serialization/tracking_enum.hpp b/include/boost/serialization/tracking_enum.hpp index 278051e1..ef38ba9c 100644 --- a/include/boost/serialization/tracking_enum.hpp +++ b/include/boost/serialization/tracking_enum.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // tracking_enum.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -28,7 +28,7 @@ enum tracking_type { // never track this type track_never = 0, - // track objects of this type if the object is serialized through a + // track objects of this type if the object is serialized through a // pointer. track_selectively = 1, // always track this type diff --git a/include/boost/serialization/traits.hpp b/include/boost/serialization/traits.hpp index 9e114fdd..45e0c93f 100644 --- a/include/boost/serialization/traits.hpp +++ b/include/boost/serialization/traits.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // traits.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -18,7 +18,7 @@ // This header is used to apply serialization traits to templates. The // standard system can't be used for platforms which don't support -// Partial Templlate Specialization. +// Partial Templlate Specialization. // The motivation for this is the Name-Value Pair (NVP) template. // it has to work the same on all platforms in order for archives @@ -42,8 +42,8 @@ template struct extended_type_info_impl; template< - class T, - int Level, + class T, + int Level, int Tracking, unsigned int Version = 0, class ETII = extended_type_info_impl< T >, diff --git a/include/boost/serialization/type_info_implementation.hpp b/include/boost/serialization/type_info_implementation.hpp index 24637a8d..8b911209 100644 --- a/include/boost/serialization/type_info_implementation.hpp +++ b/include/boost/serialization/type_info_implementation.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // type_info_implementation.hpp: interface for portable version of type_info -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -39,7 +39,7 @@ struct type_info_implementation { }; // note: at least one compiler complained w/o the full qualification // on basic traits below - typedef + typedef typename mpl::eval_if< is_base_and_derived, traits_class_typeinfo_implementation< T >, @@ -54,7 +54,7 @@ struct type_info_implementation { } // namespace boost // define a macro to assign a particular derivation of extended_type_info -// to a specified a class. +// to a specified a class. #define BOOST_CLASS_TYPE_INFO(T, ETI) \ namespace boost { \ namespace serialization { \ diff --git a/include/boost/serialization/unique_ptr.hpp b/include/boost/serialization/unique_ptr.hpp index 8d8703ef..1e5f295d 100644 --- a/include/boost/serialization/unique_ptr.hpp +++ b/include/boost/serialization/unique_ptr.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // unique_ptr.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/serialization/unordered_collections_load_imp.hpp b/include/boost/serialization/unordered_collections_load_imp.hpp index d56a423d..ca689a2f 100644 --- a/include/boost/serialization/unordered_collections_load_imp.hpp +++ b/include/boost/serialization/unordered_collections_load_imp.hpp @@ -10,7 +10,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // unordered_collections_load_imp.hpp: serialization for loading stl collections -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -24,8 +24,8 @@ #include // size_t #include // msvc 6.0 needs this for warning suppression #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::size_t; +namespace std{ + using ::size_t; } // namespace std #endif #include @@ -66,7 +66,7 @@ inline void load_unordered_collection(Archive & ar, Container &s) } } -} // namespace stl +} // namespace stl } // namespace serialization } // namespace boost diff --git a/include/boost/serialization/unordered_collections_save_imp.hpp b/include/boost/serialization/unordered_collections_save_imp.hpp index 56746ebe..1ff4916d 100644 --- a/include/boost/serialization/unordered_collections_save_imp.hpp +++ b/include/boost/serialization/unordered_collections_save_imp.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // hash_collections_save_imp.hpp: serialization for stl collections -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -69,8 +69,8 @@ inline void save_unordered_collection(Archive & ar, const Container &s) while(count-- > 0){ // note borland emits a no-op without the explicit namespace boost::serialization::save_construct_data_adl( - ar, - &(*it), + ar, + &(*it), boost::serialization::version< typename Container::value_type >::value @@ -79,7 +79,7 @@ inline void save_unordered_collection(Archive & ar, const Container &s) } } -} // namespace stl +} // namespace stl } // namespace serialization } // namespace boost diff --git a/include/boost/serialization/unordered_map.hpp b/include/boost/serialization/unordered_map.hpp index 4fdbddd7..4ebe405e 100644 --- a/include/boost/serialization/unordered_map.hpp +++ b/include/boost/serialization/unordered_map.hpp @@ -10,7 +10,7 @@ // serialization/unordered_map.hpp: // serialization for stl unordered_map templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -28,13 +28,13 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -44,15 +44,15 @@ inline void save( const unsigned int /*file_version*/ ){ boost::serialization::stl::save_unordered_collection< - Archive, + Archive, std::unordered_map >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -65,7 +65,7 @@ inline void load( Archive, std::unordered_map, boost::serialization::stl::archive_input_unordered_map< - Archive, + Archive, std::unordered_map > >(ar, t); @@ -74,9 +74,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -90,9 +90,9 @@ inline void serialize( // unordered_multimap template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -104,15 +104,15 @@ inline void save( const unsigned int /*file_version*/ ){ boost::serialization::stl::save_unordered_collection< - Archive, + Archive, std::unordered_multimap >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -129,7 +129,7 @@ inline void load( Key, HashFcn, EqualKey, Allocator >, boost::serialization::stl::archive_input_unordered_multimap< - Archive, + Archive, std::unordered_multimap > >(ar, t); @@ -138,9 +138,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > diff --git a/include/boost/serialization/unordered_set.hpp b/include/boost/serialization/unordered_set.hpp index adfee609..9ec89079 100644 --- a/include/boost/serialization/unordered_set.hpp +++ b/include/boost/serialization/unordered_set.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // unordered_set.hpp: serialization for stl unordered_set templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -26,13 +26,13 @@ #include #include -namespace boost { +namespace boost { namespace serialization { template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -44,15 +44,15 @@ inline void save( const unsigned int /*file_version*/ ){ boost::serialization::stl::save_unordered_collection< - Archive, + Archive, std::unordered_set >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -67,7 +67,7 @@ inline void load( Archive, std::unordered_set, stl::archive_input_unordered_set< - Archive, + Archive, std::unordered_set< Key, HashFcn, EqualKey, Allocator > @@ -78,9 +78,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -96,9 +96,9 @@ inline void serialize( // unordered_multiset template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -110,15 +110,15 @@ inline void save( const unsigned int /*file_version*/ ){ stl::save_unordered_collection< - Archive, + Archive, std::unordered_multiset >(ar, t); } template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > @@ -142,9 +142,9 @@ inline void load( // split non-intrusive serialization function member into separate // non intrusive save/load member functions template< - class Archive, - class Key, - class HashFcn, + class Archive, + class Key, + class HashFcn, class EqualKey, class Allocator > diff --git a/include/boost/serialization/utility.hpp b/include/boost/serialization/utility.hpp index 4867a4a1..474baa45 100644 --- a/include/boost/serialization/utility.hpp +++ b/include/boost/serialization/utility.hpp @@ -10,7 +10,7 @@ // serialization/utility.hpp: // serialization for stl utility templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ #include #include -namespace boost { +namespace boost { namespace serialization { // pair @@ -35,7 +35,7 @@ inline void serialize( std::pair & p, const unsigned int /* file_version */ ){ - // note: we remove any const-ness on the first argument. The reason is that + // note: we remove any const-ness on the first argument. The reason is that // for stl maps, the type saved is pair::type typef; diff --git a/include/boost/serialization/valarray.hpp b/include/boost/serialization/valarray.hpp index e7ec81a5..af9834ae 100644 --- a/include/boost/serialization/valarray.hpp +++ b/include/boost/serialization/valarray.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // valarray.hpp: serialization for stl vector templates -// (C) Copyright 2005 Matthias Troyer . +// (C) Copyright 2005 Matthias Troyer . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -34,7 +34,7 @@ #define STD std #endif -namespace boost { +namespace boost { namespace serialization { /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 diff --git a/include/boost/serialization/variant.hpp b/include/boost/serialization/variant.hpp index 8edda9ad..f508f01c 100644 --- a/include/boost/serialization/variant.hpp +++ b/include/boost/serialization/variant.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // variant.hpp - non-intrusive serialization of variant types // -// copyright (c) 2005 +// copyright (c) 2005 // troy d. straszheim // http://www.resophonic.com // @@ -127,7 +127,7 @@ struct variant_impl { template void load( - Archive & ar, + Archive & ar, boost::variant& v, const unsigned int version ){ @@ -162,7 +162,7 @@ inline void serialize( namespace boost { namespace serialization { - + template struct tracking_level< variant diff --git a/include/boost/serialization/vector.hpp b/include/boost/serialization/vector.hpp index 9a114c00..d7ed816a 100644 --- a/include/boost/serialization/vector.hpp +++ b/include/boost/serialization/vector.hpp @@ -9,8 +9,8 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // vector.hpp: serialization for stl vector templates -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . -// fast array serialization (C) Copyright 2005 Matthias Troyer +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// fast array serialization (C) Copyright 2005 Matthias Troyer // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -48,7 +48,7 @@ #define STD std #endif -namespace boost { +namespace boost { namespace serialization { /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 @@ -138,9 +138,9 @@ inline void save( const std::vector &t, const unsigned int file_version ){ - typedef typename + typedef typename boost::serialization::use_array_optimization::template apply< - typename remove_const::type + typename remove_const::type >::type use_optimized; save(ar,t,file_version, use_optimized()); } @@ -158,9 +158,9 @@ inline void load( return; } #endif - typedef typename + typedef typename boost::serialization::use_array_optimization::template apply< - typename remove_const::type + typename remove_const::type >::type use_optimized; load(ar,t,file_version, use_optimized()); } diff --git a/include/boost/serialization/version.hpp b/include/boost/serialization/version.hpp index 21a74d73..92dba5e4 100644 --- a/include/boost/serialization/version.hpp +++ b/include/boost/serialization/version.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // version.hpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ #include -namespace boost { +namespace boost { namespace serialization { struct basic_traits; diff --git a/include/boost/serialization/void_cast.hpp b/include/boost/serialization/void_cast.hpp index 97c5fe61..d0d4a3c1 100644 --- a/include/boost/serialization/void_cast.hpp +++ b/include/boost/serialization/void_cast.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // void_cast.hpp: interface for run-time casting of void pointers. -// (C) Copyright 2002-2009 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-2009 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -37,20 +37,20 @@ # pragma warning(disable : 4251 4231 4660 4275) #endif -namespace boost { -namespace serialization { +namespace boost { +namespace serialization { class extended_type_info; // Given a void *, assume that it really points to an instance of one type // and alter it so that it would point to an instance of a related type. // Return the altered pointer. If there exists no sequence of casts that -// can transform from_type to to_type, return a NULL. +// can transform from_type to to_type, return a NULL. BOOST_SERIALIZATION_DECL void const * void_upcast( - extended_type_info const & derived, - extended_type_info const & base, + extended_type_info const & derived, + extended_type_info const & base, void const * const t ); @@ -58,19 +58,19 @@ inline void * void_upcast( extended_type_info const & derived, extended_type_info const & base, - void * const t + void * const t ){ return const_cast(void_upcast( - derived, - base, + derived, + base, const_cast(t) )); } BOOST_SERIALIZATION_DECL void const * void_downcast( - extended_type_info const & derived, - extended_type_info const & base, + extended_type_info const & derived, + extended_type_info const & base, void const * const t ); @@ -78,11 +78,11 @@ inline void * void_downcast( extended_type_info const & derived, extended_type_info const & base, - void * const t + void * const t ){ return const_cast(void_downcast( - derived, - base, + derived, + base, const_cast(t) )); } @@ -92,14 +92,14 @@ namespace void_cast_detail { class BOOST_SYMBOL_VISIBLE void_caster : private boost::noncopyable { - friend + friend BOOST_SERIALIZATION_DECL void const * boost::serialization::void_upcast( extended_type_info const & derived, extended_type_info const & base, void const * const ); - friend + friend BOOST_SERIALIZATION_DECL void const * boost::serialization::void_downcast( extended_type_info const & derived, @@ -155,14 +155,14 @@ class BOOST_SYMBOL_VISIBLE void_caster_primitive : public void_caster { virtual void const * downcast(void const * const t) const { - const Derived * d = + const Derived * d = boost::serialization::smart_cast( static_cast(t) ); return d; } virtual void const * upcast(void const * const t) const { - const Base * b = + const Base * b = boost::serialization::smart_cast( static_cast(t) ); @@ -178,8 +178,8 @@ public: template void_caster_primitive::void_caster_primitive() : - void_caster( - & type_info_implementation::type::get_const_instance(), + void_caster( + & type_info_implementation::type::get_const_instance(), & type_info_implementation::type::get_const_instance(), /* note about displacement: * displace 0: at least one compiler treated 0 by not shifting it at all @@ -208,14 +208,14 @@ class BOOST_SYMBOL_VISIBLE void_caster_virtual_base : } public: virtual void const * downcast(void const * const t) const { - const Derived * d = + const Derived * d = dynamic_cast( static_cast(t) ); return d; } virtual void const * upcast(void const * const t) const { - const Base * b = + const Base * b = dynamic_cast( static_cast(t) ); @@ -231,8 +231,8 @@ public: template void_caster_virtual_base::void_caster_virtual_base() : - void_caster( - & (type_info_implementation::type::get_const_instance()), + void_caster( + & (type_info_implementation::type::get_const_instance()), & (type_info_implementation::type::get_const_instance()) ) { @@ -260,12 +260,12 @@ struct BOOST_SYMBOL_VISIBLE void_caster_base : >::type type; }; -} // void_cast_detail +} // void_cast_detail template -BOOST_DLLEXPORT +BOOST_DLLEXPORT inline const void_cast_detail::void_caster & void_cast_register( - Derived const * /* dnull = NULL */, + Derived const * /* dnull = NULL */, Base const * /* bnull = NULL */ ){ typedef @@ -290,8 +290,8 @@ class BOOST_SYMBOL_VISIBLE void_caster : } // namespace serialization } // namespace boost -#ifdef BOOST_MSVC -# pragma warning(pop) +#ifdef BOOST_MSVC +# pragma warning(pop) #endif #include // pops abi_suffix.hpp pragmas diff --git a/include/boost/serialization/void_cast_fwd.hpp b/include/boost/serialization/void_cast_fwd.hpp index def61d52..87cc07f5 100644 --- a/include/boost/serialization/void_cast_fwd.hpp +++ b/include/boost/serialization/void_cast_fwd.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // void_cast_fwd.hpp: interface for run-time casting of void pointers. -// (C) Copyright 2005 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2005 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -26,9 +26,9 @@ namespace void_cast_detail{ class void_caster; } // namespace void_cast_detail template -BOOST_DLLEXPORT +BOOST_DLLEXPORT inline const void_cast_detail::void_caster & void_cast_register( - const Derived * dnull = NULL, + const Derived * dnull = NULL, const Base * bnull = NULL ) BOOST_USED; } // namespace serialization diff --git a/include/boost/serialization/wrapper.hpp b/include/boost/serialization/wrapper.hpp index 60d7910b..659e45b1 100644 --- a/include/boost/serialization/wrapper.hpp +++ b/include/boost/serialization/wrapper.hpp @@ -17,17 +17,17 @@ namespace boost { namespace serialization { /// /// wrappers need to be treated differently at various places in the serialization library, /// e.g. saving of non-const wrappers has to be possible. Since partial specialization -// is not supported by all compilers, we derive all wrappers from wrapper_traits. +// is not supported by all compilers, we derive all wrappers from wrapper_traits. template< - class T, - int Level = object_serializable, + class T, + int Level = object_serializable, int Tracking = track_never, unsigned int Version = 0, class ETII = extended_type_info_impl< T > > -struct wrapper_traits : - public traits +struct wrapper_traits : + public traits {}; template diff --git a/test/A.cpp b/test/A.cpp index 361681e3..332505ff 100644 --- a/test/A.cpp +++ b/test/A.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // A.cpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,7 +16,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) namespace std{ - using ::rand; + using ::rand; using ::size_t; } #endif @@ -110,7 +110,7 @@ A::A() : #if defined(_MSC_VER) #pragma warning(pop) // Restore warnings to previous state. -#endif +#endif A_DLL_DECL bool A::operator==(const A &rhs) const { @@ -131,12 +131,12 @@ A::operator==(const A &rhs) const { if(o != rhs.o) return false; if(p != rhs.p) - return false; + return false; if(q != rhs.q) return false; #ifndef BOOST_NO_CWCHAR if(r != rhs.r) - return false; + return false; #endif if(c != rhs.c) return false; @@ -145,9 +145,9 @@ A::operator==(const A &rhs) const { if(t != rhs.t) return false; if(u != rhs.u) - return false; + return false; if(v != rhs.v) - return false; + return false; if(std::abs( boost::math::float_distance(w, rhs.w)) > 1) return false; if(std::abs( boost::math::float_distance(x, rhs.x)) > 1) @@ -157,7 +157,7 @@ A::operator==(const A &rhs) const { #ifndef BOOST_NO_STD_WSTRING if(0 != z.compare(rhs.z)) return false; - #endif + #endif return true; } @@ -199,11 +199,11 @@ A::operator<(const A &rhs) const { if(t != rhs.t ) return t < rhs.t; if(u != rhs.u ) - return u < rhs.u; + return u < rhs.u; if(v != rhs.v ) return v < rhs.v; if(w != rhs.w ) - return w < rhs.w; + return w < rhs.w; if(x != rhs.x ) return x < rhs.x; int i = y.compare(rhs.y); diff --git a/test/A.hpp b/test/A.hpp index a6aa05b6..67445d7b 100644 --- a/test/A.hpp +++ b/test/A.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // A.hpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/B.hpp b/test/B.hpp index 02329091..9111b132 100644 --- a/test/B.hpp +++ b/test/B.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // B.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -23,7 +23,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) namespace std{ - using ::rand; + using ::rand; } #endif @@ -103,9 +103,9 @@ inline bool B::operator==(const B &rhs) const { return A::operator==(rhs) - && s == rhs.s - && t == rhs.t - && u == rhs.u + && s == rhs.s + && t == rhs.t + && u == rhs.u && v == rhs.v && std::abs( boost::math::float_distance(w, rhs.w)) < 2 && std::abs( boost::math::float_distance(x, rhs.x)) < 2 diff --git a/test/C.hpp b/test/C.hpp index 7884a2be..a183db85 100644 --- a/test/C.hpp +++ b/test/C.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // C.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/D.hpp b/test/D.hpp index bb6b86d3..8af030b6 100644 --- a/test/D.hpp +++ b/test/D.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // D.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -79,7 +79,7 @@ D::~D() bool D::operator==(const D &rhs) const { if(! (*b1 == *(rhs.b1)) ) - return false; + return false; if(! (*b2 == *(rhs.b2)) ) return false; return true; diff --git a/test/J.hpp b/test/J.hpp index 81018053..1849ee75 100644 --- a/test/J.hpp +++ b/test/J.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // J.hpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/base.hpp b/test/base.hpp index 853bbc18..6491a0e5 100644 --- a/test/base.hpp +++ b/test/base.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // base.hpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/binary_archive.hpp b/test/binary_archive.hpp index b4dc63ea..abddd4f9 100644 --- a/test/binary_archive.hpp +++ b/test/binary_archive.hpp @@ -1,10 +1,10 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org for updates, documentation, and revision history. -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/binary_warchive.hpp b/test/binary_warchive.hpp index 929f3a37..a9f17c51 100644 --- a/test/binary_warchive.hpp +++ b/test/binary_warchive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/derived2.hpp b/test/derived2.hpp index 4be59166..e59b6b0f 100644 --- a/test/derived2.hpp +++ b/test/derived2.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // derived2.hpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -32,7 +32,7 @@ #define DLL_DECL #endif -class DLL_DECL derived2 : +class DLL_DECL derived2 : public base { friend class boost::serialization::access; diff --git a/test/dll_a.cpp b/test/dll_a.cpp index 6f9ab196..7a8706cc 100644 --- a/test/dll_a.cpp +++ b/test/dll_a.cpp @@ -2,7 +2,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // dll_a.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/dll_base.cpp b/test/dll_base.cpp index 87645b4d..dec8759a 100644 --- a/test/dll_base.cpp +++ b/test/dll_base.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // dll_base.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -20,7 +20,7 @@ void base::serialize( } // for some reason this is required at least by MSVC -// given that its declared virtual .. = 0; This +// given that its declared virtual .. = 0; This // seems wrong to me but here it is. //polymorphic_base::~polymorphic_base(){} diff --git a/test/dll_derived2.cpp b/test/dll_derived2.cpp index e5757b3f..db5ebdad 100644 --- a/test/dll_derived2.cpp +++ b/test/dll_derived2.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // dll_derived2.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -18,7 +18,7 @@ template void derived2::serialize( - Archive &ar, + Archive &ar, const unsigned int /* file_version */ ){ ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(base); diff --git a/test/dll_polymorphic_derived2.cpp b/test/dll_polymorphic_derived2.cpp index e15d5f20..8f6ada43 100644 --- a/test/dll_polymorphic_derived2.cpp +++ b/test/dll_polymorphic_derived2.cpp @@ -1,5 +1,5 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// polymorphic_derived2.cpp +// polymorphic_derived2.cpp // (C) Copyright 2018Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software diff --git a/test/polymorphic_array_binary_archive.hpp b/test/polymorphic_array_binary_archive.hpp index 5097433a..fbfae292 100644 --- a/test/polymorphic_array_binary_archive.hpp +++ b/test/polymorphic_array_binary_archive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_base.cpp b/test/polymorphic_base.cpp index c7bc8f4c..a3e50cda 100644 --- a/test/polymorphic_base.cpp +++ b/test/polymorphic_base.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// polymorphic_base.cpp +// polymorphic_base.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_base.hpp b/test/polymorphic_base.hpp index b0091f37..f2f3a2fd 100644 --- a/test/polymorphic_base.hpp +++ b/test/polymorphic_base.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_base.hpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -41,7 +41,7 @@ class BOOST_SYMBOL_VISIBLE polymorphic_base friend class boost::serialization::access; template POLYMORPHIC_BASE_DLL_DECL void serialize( - Archive & /* ar */, + Archive & /* ar */, const unsigned int /* file_version */ ); public: diff --git a/test/polymorphic_binary_archive.hpp b/test/polymorphic_binary_archive.hpp index 5097433a..fbfae292 100644 --- a/test/polymorphic_binary_archive.hpp +++ b/test/polymorphic_binary_archive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_derived1.cpp b/test/polymorphic_derived1.cpp index 8e6aa857..a3565f6c 100644 --- a/test/polymorphic_derived1.cpp +++ b/test/polymorphic_derived1.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// polymorphic_derived1.cpp +// polymorphic_derived1.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include "polymorphic_derived1.hpp" const char * polymorphic_derived1::get_key() const { - return + return boost::serialization::type_info_implementation< polymorphic_derived1 >::type::get_const_instance().get_key(); diff --git a/test/polymorphic_derived1.hpp b/test/polymorphic_derived1.hpp index 0ded6703..57a7c808 100644 --- a/test/polymorphic_derived1.hpp +++ b/test/polymorphic_derived1.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_derived1.hpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_derived2.cpp b/test/polymorphic_derived2.cpp index 20ee780b..1c710d42 100644 --- a/test/polymorphic_derived2.cpp +++ b/test/polymorphic_derived2.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// polymorphic_derived2.cpp +// polymorphic_derived2.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_derived2.hpp b/test/polymorphic_derived2.hpp index 8c6b1c03..0527631f 100644 --- a/test/polymorphic_derived2.hpp +++ b/test/polymorphic_derived2.hpp @@ -9,7 +9,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // polymorphic_derived2.hpp simple class test -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_text_archive.hpp b/test/polymorphic_text_archive.hpp index adf2e00d..bcda7509 100644 --- a/test/polymorphic_text_archive.hpp +++ b/test/polymorphic_text_archive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_text_warchive.hpp b/test/polymorphic_text_warchive.hpp index 7bca23bf..636ab25c 100644 --- a/test/polymorphic_text_warchive.hpp +++ b/test/polymorphic_text_warchive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_xml_archive.hpp b/test/polymorphic_xml_archive.hpp index 163cb101..fd8adbd3 100644 --- a/test/polymorphic_xml_archive.hpp +++ b/test/polymorphic_xml_archive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/polymorphic_xml_warchive.hpp b/test/polymorphic_xml_warchive.hpp index 581ec163..15b5f704 100644 --- a/test/polymorphic_xml_warchive.hpp +++ b/test/polymorphic_xml_warchive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/portable_binary_archive.hpp b/test/portable_binary_archive.hpp index ce913316..768b9588 100644 --- a/test/portable_binary_archive.hpp +++ b/test/portable_binary_archive.hpp @@ -11,7 +11,7 @@ // #include output archive header #include "../example/portable_binary_oarchive.hpp" -// define output archive class to be used +// define output archive class to be used typedef portable_binary_oarchive test_oarchive; // and corresponding stream typedef std::ofstream test_ostream; @@ -21,7 +21,7 @@ typedef std::ofstream test_ostream; typedef portable_binary_iarchive test_iarchive; typedef std::ifstream test_istream; -// since this archive class isn't compiled into the +// since this archive class isn't compiled into the // boost serialization library, include this here // so that things get instantiated #include "../example/portable_binary_oarchive.cpp" diff --git a/test/test__helper.cpp b/test/test__helper.cpp index 0d68588e..a4404e89 100644 --- a/test/test__helper.cpp +++ b/test/test__helper.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_polymorphic.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_array.cpp b/test/test_array.cpp index d5dbb88c..b23995fa 100644 --- a/test/test_array.cpp +++ b/test/test_array.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_array.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,7 +16,7 @@ #include // equal #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -85,7 +85,7 @@ int test_main( int /* argc */, char* /* argv */[] ){ res = test_std_array(); if (res != EXIT_SUCCESS) return EXIT_FAILURE; - + return EXIT_SUCCESS; } diff --git a/test/test_binary.cpp b/test/test_binary.cpp index 70b559f8..476f9ebd 100644 --- a/test/test_binary.cpp +++ b/test/test_binary.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_simple_class.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -15,8 +15,8 @@ #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::rand; +namespace std{ + using ::rand; using ::remove; } #endif @@ -86,30 +86,30 @@ int test_main( int /* argc */, char* /* argv */[] ) test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp( - "s1", + "s1", boost::serialization::make_binary_object( - s1, + s1, sizeof(s1) ) ); oa << boost::serialization::make_nvp( - "s2", + "s2", boost::serialization::make_binary_object( - s2, + s2, sizeof(s2) ) ); oa << boost::serialization::make_nvp( - "s3", + "s3", boost::serialization::make_binary_object( - s3, + s3, sizeof(s3) ) ); oa << boost::serialization::make_nvp( - "s4", + "s4", boost::serialization::make_binary_object( - s4, + s4, sizeof(s4) ) ); @@ -122,30 +122,30 @@ int test_main( int /* argc */, char* /* argv */[] ) test_istream is(testfile, TEST_STREAM_FLAGS); test_iarchive ia(is, TEST_ARCHIVE_FLAGS); ia >> boost::serialization::make_nvp( - "s1", + "s1", boost::serialization::make_binary_object( - s1_1, + s1_1, sizeof(s1) ) ); ia >> boost::serialization::make_nvp( - "s2", + "s2", boost::serialization::make_binary_object( - s1_2, + s1_2, sizeof(s2) ) ); ia >> boost::serialization::make_nvp( - "s3", + "s3", boost::serialization::make_binary_object( - s1_3, + s1_3, sizeof(s3) ) ); ia >> boost::serialization::make_nvp( - "s4", + "s4", boost::serialization::make_binary_object( - s1_4, + s1_4, sizeof(s4) ) ); diff --git a/test/test_bitset.cpp b/test/test_bitset.cpp index db91829c..356c2231 100644 --- a/test/test_bitset.cpp +++ b/test/test_bitset.cpp @@ -17,7 +17,7 @@ #if defined( BOOST_NO_STDC_NAMESPACE ) namespace std -{ +{ using ::remove; } #endif @@ -41,22 +41,22 @@ int test_main( int /* argc */, char* /* argv */[] ) bitsetA.set( 5, false ); bitsetA.set( 6, true ); bitsetA.set( 7, true ); - + { test_ostream os( testfile, TEST_STREAM_FLAGS ); test_oarchive oa( os ); oa << boost::serialization::make_nvp( "bitset", bitsetA ); } - + std::bitset<8> bitsetB; { test_istream is( testfile, TEST_STREAM_FLAGS ); test_iarchive ia( is ); ia >> boost::serialization::make_nvp( "bitset", bitsetB ); } - + BOOST_CHECK( bitsetA == bitsetB ); - + std::remove( testfile ); return EXIT_SUCCESS; } diff --git a/test/test_boost_array.cpp b/test/test_boost_array.cpp index 29965641..39ad6583 100644 --- a/test/test_boost_array.cpp +++ b/test/test_boost_array.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_array.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,7 +16,7 @@ #include // equal #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_check.cpp b/test/test_check.cpp index 2a6967c1..5f1957d2 100644 --- a/test/test_check.cpp +++ b/test/test_check.cpp @@ -18,7 +18,7 @@ #include #include -// track_selectivly with class information in the archive +// track_selectivly with class information in the archive // is unsafe when used with a pointer and should trigger a warning struct check1 { template diff --git a/test/test_class_info_load.cpp b/test/test_class_info_load.cpp index af153294..fd4e92f4 100644 --- a/test/test_class_info_load.cpp +++ b/test/test_class_info_load.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_class_info_load.cpp: test implementation level trait -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_class_info_save.cpp b/test/test_class_info_save.cpp index dc02876c..a2590bf8 100644 --- a/test/test_class_info_save.cpp +++ b/test/test_class_info_save.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_class_info_save.cpp: test implementation level trait -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -53,7 +53,7 @@ class B void serialize(Archive & /*ar*/, const unsigned int file_version){ // verify at execution that correct version number is passed on save BOOST_CHECK( - static_cast(file_version) + static_cast(file_version) == ::boost::serialization::version::value ); ++count; diff --git a/test/test_codecvt_null.cpp b/test/test_codecvt_null.cpp index 475319fd..11e434c5 100644 --- a/test/test_codecvt_null.cpp +++ b/test/test_codecvt_null.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_codecvt_null.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -21,7 +21,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -107,7 +107,7 @@ int test_main( int /* argc */, char* /* argv */[] ) { int i = 10; ofs << i; ofs.close(); - + std::wifstream ifs("testfile2"); ifs.imbue(null_locale); int i2; @@ -117,7 +117,7 @@ int test_main( int /* argc */, char* /* argv */[] ) { BOOST_CHECK(i == i2); ifs.close(); } - + std::remove(testfile); return EXIT_SUCCESS; } diff --git a/test/test_complex.cpp b/test/test_complex.cpp index 6776f7b2..7caca871 100644 --- a/test/test_complex.cpp +++ b/test/test_complex.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_complex.cpp -// (C) Copyright 2005 Matthias Troyer . +// (C) Copyright 2005 Matthias Troyer . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -20,7 +20,7 @@ #if defined(BOOST_NO_STDC_NAMESPACE) #include namespace std{ - using ::rand; + using ::rand; using ::remove; #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE) using ::numeric_limits; @@ -45,13 +45,13 @@ int test_main( int /* argc */, char* /* argv */[] ) // test array of objects std::complex a( static_cast(std::rand()) / static_cast(std::rand()), - static_cast(std::rand()) / static_cast(std::rand()) + static_cast(std::rand()) / static_cast(std::rand()) ); std::complex b( static_cast(std::rand()) / static_cast(std::rand()), static_cast(std::rand()) / static_cast(std::rand()) ); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os); oa << boost::serialization::make_nvp("afloatcomplex", a); diff --git a/test/test_const_load_fail1.cpp b/test/test_const_load_fail1.cpp index 3c5c0304..b756e6f5 100644 --- a/test/test_const_load_fail1.cpp +++ b/test/test_const_load_fail1.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_load_fail1_nvp.cpp b/test/test_const_load_fail1_nvp.cpp index f9ba9b3d..dc8d0f47 100644 --- a/test/test_const_load_fail1_nvp.cpp +++ b/test/test_const_load_fail1_nvp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_load_fail2.cpp b/test/test_const_load_fail2.cpp index 7d9b976a..06d213fa 100644 --- a/test/test_const_load_fail2.cpp +++ b/test/test_const_load_fail2.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_load_fail2_nvp.cpp b/test/test_const_load_fail2_nvp.cpp index 600461c0..eadb0769 100644 --- a/test/test_const_load_fail2_nvp.cpp +++ b/test/test_const_load_fail2_nvp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_load_fail3.cpp b/test/test_const_load_fail3.cpp index 4f385eb0..f804a8d0 100644 --- a/test/test_const_load_fail3.cpp +++ b/test/test_const_load_fail3.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_load_fail3_nvp.cpp b/test/test_const_load_fail3_nvp.cpp index e8ef913d..8995f3eb 100644 --- a/test/test_const_load_fail3_nvp.cpp +++ b/test/test_const_load_fail3_nvp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_pass.cpp b/test/test_const_pass.cpp index 211ffdd4..552d3aca 100644 --- a/test/test_const_pass.cpp +++ b/test/test_const_pass.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_save_warn1.cpp b/test/test_const_save_warn1.cpp index 185f0073..4e1625bc 100644 --- a/test/test_const_save_warn1.cpp +++ b/test/test_const_save_warn1.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_save_warn1_nvp.cpp b/test/test_const_save_warn1_nvp.cpp index 19e7c277..ffa9da59 100644 --- a/test/test_const_save_warn1_nvp.cpp +++ b/test/test_const_save_warn1_nvp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_save_warn2.cpp b/test/test_const_save_warn2.cpp index 0a77b720..d2955b61 100644 --- a/test/test_const_save_warn2.cpp +++ b/test/test_const_save_warn2.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_save_warn2_nvp.cpp b/test/test_const_save_warn2_nvp.cpp index 7b887c5d..4a4d0388 100644 --- a/test/test_const_save_warn2_nvp.cpp +++ b/test/test_const_save_warn2_nvp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_save_warn3.cpp b/test/test_const_save_warn3.cpp index 19c14967..55759cc7 100644 --- a/test/test_const_save_warn3.cpp +++ b/test/test_const_save_warn3.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_save_warn3_nvp.cpp b/test/test_const_save_warn3_nvp.cpp index 7571b3c6..fe8a9b0e 100644 --- a/test/test_const_save_warn3_nvp.cpp +++ b/test/test_const_save_warn3_nvp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_const_save_warn4.cpp b/test/test_const_save_warn4.cpp index c9599aaa..53007165 100644 --- a/test/test_const_save_warn4.cpp +++ b/test/test_const_save_warn4.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,7 +25,7 @@ struct A { // save(..){ // ar << xptr; // } -// +// // for rational - consider the following example from demo.cpp // std::list > schedule // its not obvious to me how this can be cast to: diff --git a/test/test_const_save_warn4_nvp.cpp b/test/test_const_save_warn4_nvp.cpp index 9c61db61..3cb59d41 100644 --- a/test/test_const_save_warn4_nvp.cpp +++ b/test/test_const_save_warn4_nvp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -25,13 +25,13 @@ struct A { // save(..){ // ar << xptr; // } -// +// // for rational - consider the following example from demo.cpp -// +// // std::list > schedule -// +// // its not obvious to me how this can be cast to: -// +// // std::list > schedule void f4(text_oarchive & oa, A * const & a){ diff --git a/test/test_contained_class.cpp b/test/test_contained_class.cpp index 5dc15e2f..4830fa99 100644 --- a/test/test_contained_class.cpp +++ b/test/test_contained_class.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_contained_class.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -51,7 +51,7 @@ int test_main( int /* argc */, char* /* argv */[] ) const C c; C c1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("c", c); diff --git a/test/test_cyclic_ptrs.cpp b/test/test_cyclic_ptrs.cpp index 365949df..cce8b6f9 100644 --- a/test/test_cyclic_ptrs.cpp +++ b/test/test_cyclic_ptrs.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_cyclic_ptrs.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -62,10 +62,10 @@ bool J::operator==(const J &rhs) const // of those objects which it points to either directly or indirectly. // When those objects are subsequently serialized, it is discovered // that have already been serialized through pointers. This is -// detected by the system and an exception - pointer_conflict - +// detected by the system and an exception - pointer_conflict - // is thrown. Permiting this to go undetected would result in the // creation of multiple equal objects rather than the original -// structure. +// structure. class K { J j1; @@ -157,7 +157,7 @@ int test3(){ boost::archive::archive_exception exception( boost::archive::archive_exception::no_exception ); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); BOOST_TRY { diff --git a/test/test_delete_pointer.cpp b/test/test_delete_pointer.cpp index a4b7561f..80493e04 100644 --- a/test/test_delete_pointer.cpp +++ b/test/test_delete_pointer.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_delete_pointer.cpp -// (C) Copyright 2002 Vahan Margaryan. +// (C) Copyright 2002 Vahan Margaryan. // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -13,7 +13,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_deque.cpp b/test/test_deque.cpp index e144a399..37ab90a3 100644 --- a/test/test_deque.cpp +++ b/test/test_deque.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_deque.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -47,7 +47,7 @@ int test_main( int /* argc */, char* /* argv */[] ) ia >> boost::serialization::make_nvp("adeque",adeque1); } BOOST_CHECK(adeque == adeque1); - + std::remove(testfile); return EXIT_SUCCESS; } diff --git a/test/test_derived.cpp b/test/test_derived.cpp index 4c3697b1..fb378e21 100644 --- a/test/test_derived.cpp +++ b/test/test_derived.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_derived.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -68,7 +68,7 @@ void save_derived(const char *testfile) // result. In the current type id system base *b1 = d1; base *b2 = d2; - + // Warning, the current type id system does not yield true // type id for non-polymorphic types const boost::serialization::extended_type_info & this_type @@ -80,7 +80,7 @@ void save_derived(const char *testfile) ::get_const_instance().get_derived_extended_type_info(*b1); BOOST_WARN_MESSAGE( - !(this_type == true_type), + !(this_type == true_type), "current type id system does not support non-polymorphic types" ); @@ -106,7 +106,7 @@ void load_derived(const char *testfile) // result. In the current type id system base *b1 = NULL; base *b2 = NULL; - + // note: this will produce incorrect results for non-polymorphic classes ia >> BOOST_SERIALIZATION_NVP(b1); ia >> BOOST_SERIALIZATION_NVP(b2); @@ -120,9 +120,9 @@ void load_derived(const char *testfile) const boost::serialization::extended_type_info & true_type = * boost::serialization::type_info_implementation::type ::get_const_instance().get_derived_extended_type_info(*b1); - + BOOST_WARN_MESSAGE( - ! (this_type == true_type), + ! (this_type == true_type), "current type id system does fails for non-polymorphic types" ); diff --git a/test/test_derived_class.cpp b/test/test_derived_class.cpp index f123c92c..056c8ebe 100644 --- a/test/test_derived_class.cpp +++ b/test/test_derived_class.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_derived_class.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -13,7 +13,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -26,12 +26,12 @@ namespace std{ int test_main( int /*argc*/, char* /*argv*/[] ) { const char * testfile = boost::archive::tmpnam(NULL); - + BOOST_REQUIRE(NULL != testfile); B b, b1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("b", b); diff --git a/test/test_derived_class_ptr.cpp b/test/test_derived_class_ptr.cpp index d6385cfd..6749c822 100644 --- a/test/test_derived_class_ptr.cpp +++ b/test/test_derived_class_ptr.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_deriviec_class_.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -26,13 +26,13 @@ namespace std{ int test_main( int /* argc */, char* /* argv */[] ) { - const char * testfile = boost::archive::tmpnam(NULL); + const char * testfile = boost::archive::tmpnam(NULL); BOOST_REQUIRE(NULL != testfile); B * tb = new B; B * tb1 = NULL; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("tb", tb); diff --git a/test/test_diamond.cpp b/test/test_diamond.cpp index d62e5673..9eaf4577 100644 --- a/test/test_diamond.cpp +++ b/test/test_diamond.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_diamond.cpp -// (C) Copyright 2002-2009 Vladimir Prus and Robert Ramey. +// (C) Copyright 2002-2009 Vladimir Prus and Robert Ramey. // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -15,7 +15,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -61,7 +61,7 @@ public: BOOST_SERIALIZATION_SPLIT_MEMBER() - bool operator==(const base& another) const + bool operator==(const base& another) const { return i == another.i && m == another.m; } @@ -69,12 +69,12 @@ public: virtual ~base() {}; private: int i; - std::map m; + std::map m; }; // note: the default is for object tracking to be performed if and only // if and object of the corresponding class is anywhere serialized -// through a pointer. In this example, that doesn't occur so +// through a pointer. In this example, that doesn't occur so // by default, the shared base object wouldn't normally be tracked. // This would leave to multiple save/load operation of the data in // this shared base class. This wouldn't cause an error, but it would @@ -106,7 +106,7 @@ public: }; class derived2 : virtual public base { -public: +public: template void save(Archive &ar, const unsigned int /* file_version */) const { @@ -133,7 +133,7 @@ public: void save(Archive &ar, const unsigned int /* file_version */) const { std::cout << "Saving final\n"; - ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(derived1); + ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(derived1); ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(derived2); } @@ -141,7 +141,7 @@ public: void load(Archive & ar, const unsigned int /* file_version */) { std::cout << "Restoring final\n"; - ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(derived1); + ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(derived1); ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(derived2); } @@ -155,8 +155,8 @@ test_main( int /* argc */, char* /* argv */[] ) { const char * testfile = boost::archive::tmpnam(NULL); BOOST_REQUIRE(NULL != testfile); - - const final b(3); + + const final b(3); { test_ostream ofs(testfile, TEST_STREAM_FLAGS); test_oarchive oa(ofs); @@ -183,7 +183,7 @@ test_main( int /* argc */, char* /* argv */[] ) const base* bp = new final( 3 ); { - test_ostream ofs(testfile); + test_ostream ofs(testfile); test_oarchive oa(ofs); oa << BOOST_SERIALIZATION_NVP(bp); } diff --git a/test/test_diamond_complex.cpp b/test/test_diamond_complex.cpp index 388eccf2..826c7fb8 100644 --- a/test/test_diamond_complex.cpp +++ b/test/test_diamond_complex.cpp @@ -15,7 +15,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -75,7 +75,7 @@ public: BOOST_SERIALIZATION_SPLIT_MEMBER() - bool operator==(const EX1Level1& another) const + bool operator==(const EX1Level1& another) const { return i == another.i && m == another.m; } @@ -83,12 +83,12 @@ public: virtual ~EX1Level1() {}; private: int i; - std::map m; + std::map m; }; // note: the default is for object tracking to be performed if and only // if and object of the corresponding class is anywhere serialized -// through a pointer. In this example, that doesn't occur so +// through a pointer. In this example, that doesn't occur so // by default, the shared EX1Level1 object wouldn't normally be tracked. // This would leave to multiple save/load operation of the data in // this shared EX1Level1 class. This wouldn't cause an error, but it would @@ -120,7 +120,7 @@ public: }; class EX1Level2_B : virtual public EX1Level1 { -public: +public: template void save(Archive &ar, const unsigned int /* file_version */) const { @@ -147,7 +147,7 @@ public: void save(Archive &ar, const unsigned int /* file_version */) const { std::cout << "Saving EX1Level3_A\n"; - ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_A); + ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_A); ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_B); } @@ -155,7 +155,7 @@ public: void load(Archive & ar, const unsigned int /* file_version */) { std::cout << "Restoring EX1Level3_A\n"; - ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_A); + ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_A); ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_B); } @@ -172,7 +172,7 @@ public: void save(Archive &ar, const unsigned int /* file_version */) const { std::cout << "Saving EX1Level3_B\n"; - ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_A); + ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_A); ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_B); } @@ -180,7 +180,7 @@ public: void load(Archive & ar, const unsigned int /* file_version */) { std::cout << "Restoring EX1Level3_B\n"; - ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_A); + ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_A); ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level2_B); } @@ -196,14 +196,14 @@ public: void save(Archive &ar, const unsigned int /* file_version */) const { std::cout << "Saving EX1Level4\n"; - ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level3_B); + ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level3_B); } template void load(Archive & ar, const unsigned int /* file_version */) { std::cout << "Restoring EX1Level4\n"; - ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level3_B); + ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX1Level3_B); } BOOST_SERIALIZATION_SPLIT_MEMBER() @@ -238,7 +238,7 @@ public: BOOST_SERIALIZATION_SPLIT_MEMBER() - bool operator==(const EX2Level1& another) const + bool operator==(const EX2Level1& another) const { return i == another.i && m == another.m; } @@ -246,12 +246,12 @@ public: virtual ~EX2Level1() {}; private: int i; - std::map m; + std::map m; }; // note: the default is for object tracking to be performed if and only // if and object of the corresponding class is anywhere serialized -// through a pointer. In this example, that doesn't occur so +// through a pointer. In this example, that doesn't occur so // by default, the shared EX2Level1 object wouldn't normally be tracked. // This would leave to multiple save/load operation of the data in // this shared EX2Level1 class. This wouldn't cause an error, but it would @@ -283,7 +283,7 @@ public: }; class EX2Level2_B : virtual public EX2Level1 { -public: +public: template void save(Archive &ar, const unsigned int /* file_version */) const { @@ -310,7 +310,7 @@ public: void save(Archive &ar, const unsigned int /* file_version */) const { std::cout << "Saving EX2Level3_A\n"; - ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_A); + ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_A); ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_B); } @@ -318,7 +318,7 @@ public: void load(Archive & ar, const unsigned int /* file_version */) { std::cout << "Restoring EX2Level3_A\n"; - ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_A); + ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_A); ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_B); } @@ -335,7 +335,7 @@ public: void save(Archive &ar, const unsigned int /* file_version */) const { std::cout << "Saving EX2Level3_B\n"; - ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_A); + ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_A); ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_B); } @@ -343,7 +343,7 @@ public: void load(Archive & ar, const unsigned int /* file_version */) { std::cout << "Restoring EX2Level3_B\n"; - ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_A); + ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_A); ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level2_B); } @@ -359,14 +359,14 @@ public: void save(Archive &ar, const unsigned int /* file_version */) const { std::cout << "Saving EX2Level4\n"; - ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level3_B); + ar << BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level3_B); } template void load(Archive & ar, const unsigned int /* file_version */) { std::cout << "Restoring EX2Level4\n"; - ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level3_B); + ar >> BOOST_SERIALIZATION_BASE_OBJECT_NVP(EX2Level3_B); } BOOST_SERIALIZATION_SPLIT_MEMBER() @@ -383,7 +383,7 @@ test_main( int /* argc */, char* /* argv */[] ) { const char * testfile = boost::archive::tmpnam(NULL); BOOST_REQUIRE(NULL != testfile); - + { save_count = 0; load_count = 0; @@ -411,7 +411,7 @@ test_main( int /* argc */, char* /* argv */[] ) save_count = 0; load_count = 0; - const EX1Level4 ex1L4_save(3); + const EX1Level4 ex1L4_save(3); const EX1Level1 *ex1L1_save = &ex1L4_save; { test_ostream ofs(testfile, TEST_STREAM_FLAGS); @@ -457,7 +457,7 @@ test_main( int /* argc */, char* /* argv */[] ) save_count = 0; load_count = 0; - const EX2Level4 ex2L4_save(3); + const EX2Level4 ex2L4_save(3); const EX2Level1 *ex2L1_save = &ex2L4_save; { test_ostream ofs(testfile, TEST_STREAM_FLAGS); diff --git a/test/test_dll_exported.cpp b/test/test_dll_exported.cpp index 92adbc25..69b996c5 100644 --- a/test/test_dll_exported.cpp +++ b/test/test_dll_exported.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_dll_exported.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -30,7 +30,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -94,7 +94,7 @@ void load_exported(const char *testfile) BOOST_CHECK_MESSAGE( boost::serialization::type_info_implementation ::type::get_const_instance() - == + == * boost::serialization::type_info_implementation ::type::get_const_instance().get_derived_extended_type_info(*rb1), "restored pointer b1 not of correct type" @@ -103,7 +103,7 @@ void load_exported(const char *testfile) BOOST_CHECK_MESSAGE( boost::serialization::type_info_implementation ::type::get_const_instance() - == + == * boost::serialization::type_info_implementation ::type::get_const_instance().get_derived_extended_type_info(*rb2), "restored pointer b2 not of correct type" @@ -112,7 +112,7 @@ void load_exported(const char *testfile) BOOST_CHECK_MESSAGE( boost::serialization::type_info_implementation ::type::get_const_instance() - == + == * boost::serialization::type_info_implementation ::type::get_const_instance().get_derived_extended_type_info(*rd21), "restored pointer d2 not of correct type" diff --git a/test/test_dll_plugin.cpp b/test/test_dll_plugin.cpp index fe095231..c5c4a5fb 100644 --- a/test/test_dll_plugin.cpp +++ b/test/test_dll_plugin.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_dll_plugin.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -12,7 +12,7 @@ // a class instance while knowing nothing more than its // exported class ID (GUID) and a base class from which // it is derived. This is referred to as a "plugin" -// since the same program could, without recompilation, +// since the same program could, without recompilation, // manipulate any number of derived types - even those // which have not been yet been created. @@ -21,7 +21,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -88,7 +88,7 @@ void save_exported(const char *testfile) assert(NULL != rd2); // transform the pointer to a pointer to the base class - polymorphic_base const * const rb2 + polymorphic_base const * const rb2 = static_cast( boost::serialization::void_upcast( * d2_eti, @@ -126,7 +126,7 @@ void load_exported(const char *testfile) BOOST_CHECK_MESSAGE( boost::serialization::type_info_implementation ::type::get_const_instance() - == + == * boost::serialization::type_info_implementation ::type::get_const_instance().get_derived_extended_type_info(*rb1), "restored pointer b1 not of correct type" @@ -142,7 +142,7 @@ void load_exported(const char *testfile) BOOST_CHECK_MESSAGE( * d2_eti - == + == * boost::serialization::type_info_implementation ::type::get_const_instance().get_derived_extended_type_info(*rb2), "restored pointer b2 not of correct type" @@ -167,7 +167,7 @@ test_main( int /* argc */, char* /* argv */[] ) HINSTANCE hDLL; // Handle to DLL hDLL = LoadLibrary(_T("polymorphic_derived2.dll")); BOOST_CHECK_MESSAGE( - (0 != hDLL), + (0 != hDLL), "Failed to find/load polymorphic_derived2" ); if(0 == hDLL) diff --git a/test/test_dll_simple.cpp b/test/test_dll_simple.cpp index dd7f98bc..278d25c9 100644 --- a/test/test_dll_simple.cpp +++ b/test/test_dll_simple.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_dll_simple.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -17,7 +17,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -40,7 +40,7 @@ test1(){ const A a; A a1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); boost::archive::text_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("a", a); @@ -63,7 +63,7 @@ test2(){ const A a; A a1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); boost::archive::polymorphic_text_oarchive oa(os, TEST_ARCHIVE_FLAGS); boost::archive::polymorphic_oarchive & poa(oa); @@ -88,7 +88,7 @@ test3(){ const A *a = new A; A *a1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); boost::archive::text_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("a", a); @@ -112,7 +112,7 @@ test4(){ const A *a = new A; A *a1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); boost::archive::polymorphic_text_oarchive oa(os, TEST_ARCHIVE_FLAGS); boost::archive::polymorphic_oarchive & poa(oa); @@ -140,7 +140,7 @@ test5(){ const B b; B b1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); boost::archive::text_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("b", b); @@ -163,7 +163,7 @@ test6(){ const B b; B b1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); boost::archive::polymorphic_text_oarchive oa(os, TEST_ARCHIVE_FLAGS); boost::archive::polymorphic_oarchive & poa(oa); @@ -188,7 +188,7 @@ test7(){ const B *b = new B; B *b1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); boost::archive::text_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("b", b); @@ -212,7 +212,7 @@ test8(){ const B *b = new B; B *b1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); boost::archive::polymorphic_text_oarchive oa(os, TEST_ARCHIVE_FLAGS); boost::archive::polymorphic_oarchive & poa(oa); @@ -231,7 +231,7 @@ test8(){ } -int +int test_main( int /* argc */, char* /* argv */[] ) { test1(); diff --git a/test/test_enable_shared_from_this.cpp b/test/test_enable_shared_from_this.cpp index 9003aee1..608837e2 100644 --- a/test/test_enable_shared_from_this.cpp +++ b/test/test_enable_shared_from_this.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_enable_shared_from_this.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -140,7 +140,7 @@ void test_passes(){ // verify shared_from_this BOOST_CHECK(d == raw_d->SharedPtr()); - } + } } // This test fails @@ -180,10 +180,10 @@ void test_fails(){ BOOST_CHECK(raw_d->m_derived==2); // verify shared_from_this - // FAIL: The following line throws bad_weak_ptr exception + // FAIL: The following line throws bad_weak_ptr exception boost::shared_ptr d = raw_d->SharedPtr(); BOOST_CHECK(d == b); - } + } } int test_main(int /*argc*/, char * /*argv */[]){ diff --git a/test/test_exported.cpp b/test/test_exported.cpp index 726f4362..2134c6c3 100644 --- a/test/test_exported.cpp +++ b/test/test_exported.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_exported.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -69,7 +69,7 @@ void load_exported(const char *testfile) BOOST_CHECK_MESSAGE( boost::serialization::type_info_implementation ::type::get_const_instance() - == + == * boost::serialization::type_info_implementation ::type::get_const_instance().get_derived_extended_type_info(*rb1), "restored pointer b1 not of correct type" @@ -79,7 +79,7 @@ void load_exported(const char *testfile) BOOST_CHECK_MESSAGE( boost::serialization::type_info_implementation ::type::get_const_instance() - == + == * boost::serialization::type_info_implementation ::type::get_const_instance().get_derived_extended_type_info(*rb2), "restored pointer b2 not of correct type" diff --git a/test/test_forward_list.cpp b/test/test_forward_list.cpp index 4d6bcd55..ac8af3d9 100644 --- a/test/test_forward_list.cpp +++ b/test/test_forward_list.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_forward_list.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -12,7 +12,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -32,7 +32,7 @@ int test_main( int /* argc */, char* /* argv */[] ) std::forward_list aslist; aslist.push_front(A()); aslist.push_front(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("aslist", aslist); diff --git a/test/test_forward_list_ptrs.cpp b/test/test_forward_list_ptrs.cpp index 7071352b..a5bfab08 100644 --- a/test/test_forward_list_ptrs.cpp +++ b/test/test_forward_list_ptrs.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_list.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -50,7 +50,7 @@ void test_forward_list(){ BOOST_REQUIRE(NULL != testfile); std::forward_list aslist; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); aslist.push_front(new A); @@ -72,13 +72,13 @@ void test_forward_list(){ ); } std::for_each( - aslist.begin(), - aslist.end(), + aslist.begin(), + aslist.end(), boost::checked_deleter() ); std::for_each( - aslist1.begin(), - aslist1.end(), + aslist1.begin(), + aslist1.end(), boost::checked_deleter() ); std::remove(testfile); @@ -87,7 +87,7 @@ void test_forward_list(){ int test_main( int /* argc */, char* /* argv */[] ) { test_forward_list(); - + return EXIT_SUCCESS; } diff --git a/test/test_helper_support.cpp b/test/test_helper_support.cpp index cc9dba2e..b216543b 100644 --- a/test/test_helper_support.cpp +++ b/test/test_helper_support.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_helper_support.cpp -// (C) Copyright 2008 Joaquin M Lopez Munoz. +// (C) Copyright 2008 Joaquin M Lopez Munoz. // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -15,7 +15,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_inclusion.cpp b/test/test_inclusion.cpp index 33af2869..f42639a6 100644 --- a/test/test_inclusion.cpp +++ b/test/test_inclusion.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include struct foo diff --git a/test/test_inclusion2.cpp b/test/test_inclusion2.cpp index 0bd956e2..dfecccdc 100644 --- a/test/test_inclusion2.cpp +++ b/test/test_inclusion2.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_const.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_interrupts.cpp b/test/test_interrupts.cpp index fbf1930b..6dd599dd 100644 --- a/test/test_interrupts.cpp +++ b/test/test_interrupts.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_array.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,7 +16,7 @@ #include // equal #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_iterators.cpp b/test/test_iterators.cpp index 048c7949..259e2467 100644 --- a/test/test_iterators.cpp +++ b/test/test_iterators.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_iterators.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -18,7 +18,7 @@ #include #ifdef BOOST_NO_STDC_NAMESPACE namespace std{ - using ::rand; + using ::rand; } #endif @@ -93,8 +93,8 @@ void test_roundtrip(const wchar_t * la){ template void test_xml_escape( - const CharType * xml_escaped, - const CharType * xml, + const CharType * xml_escaped, + const CharType * xml, unsigned int size ){ typedef boost::archive::iterators::xml_escape translator; @@ -110,8 +110,8 @@ void test_xml_escape( template void test_xml_unescape( - const CharType * xml, - const CharType * xml_escaped, + const CharType * xml, + const CharType * xml_escaped, unsigned int size ){ @@ -138,7 +138,7 @@ void test_transform_width(unsigned int size){ // convert 8 to 6 bit characters typedef boost::archive::iterators::transform_width< - char *, BitsOut, BitsIn + char *, BitsOut, BitsIn > translator1; std::vector vout; @@ -180,7 +180,7 @@ void test_transform_width(unsigned int size){ template void test_stream_iterators( - const CharType * test_data, + const CharType * test_data, unsigned int size ){ std::basic_stringstream ss; @@ -201,13 +201,13 @@ test_main(int /* argc */, char* /* argv */ [] ) const char xml[] = "<+>+&+\"+'"; const char xml_escaped[] = "<+>+&+"+'"; test_xml_escape( - xml_escaped, - xml, + xml_escaped, + xml, sizeof(xml) / sizeof(char) - 1 ); test_xml_unescape( - xml, - xml_escaped, + xml, + xml_escaped, sizeof(xml_escaped) / sizeof(char) - 1 ); @@ -216,13 +216,13 @@ test_main(int /* argc */, char* /* argv */ [] ) const wchar_t wxml[] = L"<+>+&+\"+'"; const wchar_t wxml_escaped[] = L"<+>+&+"+'"; test_xml_escape( - wxml_escaped, - wxml, + wxml_escaped, + wxml, sizeof(wxml) / sizeof(wchar_t) - 1 ); test_xml_unescape( - wxml, - wxml_escaped, + wxml, + wxml_escaped, sizeof(wxml_escaped) / sizeof(wchar_t) - 1 ); diff --git a/test/test_iterators_base64.cpp b/test/test_iterators_base64.cpp index cdfeabce..1f772c6d 100644 --- a/test/test_iterators_base64.cpp +++ b/test/test_iterators_base64.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_iterators.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -18,8 +18,8 @@ #include #ifdef BOOST_NO_STDC_NAMESPACE -namespace std{ - using ::rand; +namespace std{ + using ::rand; using ::size_t; } #endif @@ -45,7 +45,7 @@ void test_base64(unsigned int size){ typedef std::list text_base64_type; text_base64_type text_base64; - typedef + typedef boost::archive::iterators::insert_linebreaks< boost::archive::iterators::base64_from_binary< boost::archive::iterators::transform_width< @@ -53,9 +53,9 @@ void test_base64(unsigned int size){ ,6 ,sizeof(CharType) * 8 > - > + > ,76 - > + > translate_out; std::copy( @@ -64,8 +64,8 @@ void test_base64(unsigned int size){ std::back_inserter(text_base64) ); - // convert from base64 to binary and compare with the original - typedef + // convert from base64 to binary and compare with the original + typedef boost::archive::iterators::transform_width< boost::archive::iterators::binary_from_base64< boost::archive::iterators::remove_whitespace< @@ -75,7 +75,7 @@ void test_base64(unsigned int size){ sizeof(CharType) * 8, 6 > translate_in; - + BOOST_CHECK( std::equal( rawdata, diff --git a/test/test_list.cpp b/test/test_list.cpp index 81b8cf9c..c76757ef 100644 --- a/test/test_list.cpp +++ b/test/test_list.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_list.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -33,7 +33,7 @@ void test_list(){ std::list alist; alist.push_back(A()); alist.push_back(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("alist",alist); diff --git a/test/test_list_ptrs.cpp b/test/test_list_ptrs.cpp index ede26880..f5597fab 100644 --- a/test/test_list_ptrs.cpp +++ b/test/test_list_ptrs.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_list.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -50,7 +50,7 @@ void test_list(){ BOOST_REQUIRE(NULL != testfile); std::list alist; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); A * free_a_ptr = new A; @@ -69,7 +69,7 @@ void test_list(){ ia >> boost::serialization::make_nvp("alist", alist1); ia >> boost::serialization::make_nvp("free_a_ptr", free_a_ptr1); BOOST_CHECK( - alist.size() == alist1.size() + alist.size() == alist1.size() && std::equal(alist.begin(),alist.end(),alist1.begin(),ptr_equal_to()) ); // verify that first element is the same as the free pointer @@ -77,13 +77,13 @@ void test_list(){ } std::for_each( - alist.begin(), - alist.end(), + alist.begin(), + alist.end(), boost::checked_deleter() ); std::for_each( - alist1.begin(), - alist1.end(), + alist1.begin(), + alist1.end(), boost::checked_deleter() ); std::remove(testfile); diff --git a/test/test_map.cpp b/test/test_map.cpp index 66e6f885..21e3f51a 100644 --- a/test/test_map.cpp +++ b/test/test_map.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_map.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -19,8 +19,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::rand; +namespace std{ + using ::rand; using ::size_t; } #endif @@ -40,7 +40,7 @@ struct random_key { friend class boost::serialization::access; template void serialize( - Archive & ar, + Archive & ar, const unsigned int /* file_version */ ){ ar & boost::serialization::make_nvp("random_key", m_i); @@ -56,7 +56,7 @@ struct random_key { operator std::size_t () const { // required by hash_map return m_i; } -}; +}; void test_map(){ @@ -68,7 +68,7 @@ test_map(){ std::map amap; amap.insert(std::make_pair(random_key(), A())); amap.insert(std::make_pair(random_key(), A())); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("amap", amap); @@ -124,7 +124,7 @@ test_multimap(){ std::multimap amultimap; amultimap.insert(std::make_pair(random_key(), A())); amultimap.insert(std::make_pair(random_key(), A())); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("amultimap", amultimap); @@ -144,6 +144,6 @@ int test_main( int /* argc */, char* /* argv */[] ) test_map(); test_map_2(); test_multimap(); - + return EXIT_SUCCESS; } diff --git a/test/test_map_boost_unordered.cpp b/test/test_map_boost_unordered.cpp index 5af31e16..300ae4db 100644 --- a/test/test_map_boost_unordered.cpp +++ b/test/test_map_boost_unordered.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_map.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -19,8 +19,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::rand; +namespace std{ + using ::rand; using ::size_t; } #endif @@ -40,7 +40,7 @@ struct random_key { friend class boost::serialization::access; template void serialize( - Archive & ar, + Archive & ar, const unsigned int /* file_version */ ){ ar & boost::serialization::make_nvp("random_key", m_i); @@ -56,7 +56,7 @@ struct random_key { operator std::size_t () const { // required by hash_map return m_i; } -}; +}; #include #include // requires changeset [69520]; Ticket #5254 @@ -80,7 +80,7 @@ test_unordered_map(){ boost::unordered_map anunordered_map; anunordered_map.insert(std::make_pair(random_key(), A())); anunordered_map.insert(std::make_pair(random_key(), A())); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunorderedmap",anunordered_map); @@ -111,7 +111,7 @@ test_unordered_multimap(){ boost::unordered_multimap anunordered_multimap; anunordered_multimap.insert(std::make_pair(random_key(), A())); anunordered_multimap.insert(std::make_pair(random_key(), A())); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunordered_multimap", anunordered_multimap); diff --git a/test/test_map_hashed.cpp b/test/test_map_hashed.cpp index 3fcb902c..8b009cd2 100644 --- a/test/test_map_hashed.cpp +++ b/test/test_map_hashed.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_map.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -19,8 +19,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::rand; +namespace std{ + using ::rand; using ::size_t; } #endif @@ -40,7 +40,7 @@ struct random_key { friend class boost::serialization::access; template void serialize( - Archive & ar, + Archive & ar, const unsigned int /* file_version */ ){ ar & boost::serialization::make_nvp("random_key", m_i); @@ -56,7 +56,7 @@ struct random_key { operator std::size_t () const { // required by hash_map return m_i; } -}; +}; #include @@ -67,7 +67,7 @@ namespace BOOST_STD_EXTENSION_NAMESPACE { return static_cast(r); } }; -} // namespace BOOST_STD_EXTENSION_NAMESPACE +} // namespace BOOST_STD_EXTENSION_NAMESPACE void test_hash_map(){ @@ -79,7 +79,7 @@ test_hash_map(){ BOOST_STD_EXTENSION_NAMESPACE::hash_map ahash_map; ahash_map.insert(std::make_pair(random_key(), A())); ahash_map.insert(std::make_pair(random_key(), A())); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("ahashmap",ahash_map); @@ -110,7 +110,7 @@ test_hash_multimap(){ BOOST_STD_EXTENSION_NAMESPACE::hash_multimap ahash_multimap; ahash_multimap.insert(std::make_pair(random_key(), A())); ahash_multimap.insert(std::make_pair(random_key(), A())); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("ahash_multimap", ahash_multimap); diff --git a/test/test_map_unordered.cpp b/test/test_map_unordered.cpp index 488e928a..631f1f22 100644 --- a/test/test_map_unordered.cpp +++ b/test/test_map_unordered.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_map.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -19,8 +19,8 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ - using ::rand; +namespace std{ + using ::rand; using ::size_t; } #endif @@ -40,7 +40,7 @@ struct random_key { friend class boost::serialization::access; template void serialize( - Archive & ar, + Archive & ar, const unsigned int /* file_version */ ){ ar & boost::serialization::make_nvp("random_key", m_i); @@ -56,7 +56,7 @@ struct random_key { operator std::size_t () const { // required by hash_map return m_i; } -}; +}; #include #include // requires changeset [69520]; Ticket #5254 @@ -80,7 +80,7 @@ test_unordered_map(){ std::unordered_map anunordered_map; anunordered_map.insert(std::make_pair(random_key(), A())); anunordered_map.insert(std::make_pair(random_key(), A())); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunorderedmap",anunordered_map); @@ -111,7 +111,7 @@ test_unordered_multimap(){ std::unordered_multimap anunordered_multimap; anunordered_multimap.insert(std::make_pair(random_key(), A())); anunordered_multimap.insert(std::make_pair(random_key(), A())); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunordered_multimap", anunordered_multimap); diff --git a/test/test_mi.cpp b/test/test_mi.cpp index 22e6454d..cf9df90c 100644 --- a/test/test_mi.cpp +++ b/test/test_mi.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_mi.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,7 +16,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_mult_archive_types.cpp b/test/test_mult_archive_types.cpp index 66915323..b211489a 100644 --- a/test/test_mult_archive_types.cpp +++ b/test/test_mult_archive_types.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// test_mult_archive_types.cpp +// test_mult_archive_types.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -12,7 +12,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_multiple_inheritance.cpp b/test/test_multiple_inheritance.cpp index 06535195..08c304f8 100644 --- a/test/test_multiple_inheritance.cpp +++ b/test/test_multiple_inheritance.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_multiple_inheritance.cpp -// (C) Copyright 2009 Robert Ramey. +// (C) Copyright 2009 Robert Ramey. // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -63,15 +63,15 @@ struct Base2 { //BOOST_CLASS_EXPORT(Base2) struct Sub : - public Base1, - public Base2 + public Base1, + public Base2 { int m_x; Sub(){} Sub(int x) : Base1(x), Base2(x), - m_x(x) + m_x(x) {} bool operator==(Sub & rhs) const { if(! Base2::operator==(rhs)) diff --git a/test/test_multiple_ptrs.cpp b/test/test_multiple_ptrs.cpp index df1e5fba..b1da8422 100644 --- a/test/test_multiple_ptrs.cpp +++ b/test/test_multiple_ptrs.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_archive_derivation.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -32,7 +32,7 @@ int test_main( int /* argc */, char* /* argv */[] ) const A a; A a1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("a", a); diff --git a/test/test_native_array.cpp b/test/test_native_array.cpp index 228f537a..a08cdcc0 100644 --- a/test/test_native_array.cpp +++ b/test/test_native_array.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_array.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,7 +16,7 @@ #include // equal #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_new_operator.cpp b/test/test_new_operator.cpp index b6931216..c7b1e7e6 100644 --- a/test/test_new_operator.cpp +++ b/test/test_new_operator.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_new_operator.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -15,7 +15,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -37,7 +37,7 @@ public: static unsigned int m_new_calls; static unsigned int m_delete_calls; // implement class specific new/delete in terms standard - // implementation - we're testing serialization + // implementation - we're testing serialization // not "new" here. static void * operator new(size_t s){ ++m_new_calls; @@ -61,7 +61,7 @@ public: static unsigned int m_new_calls; static unsigned int m_delete_calls; // implement class specific new/delete in terms standard - // implementation - we're testing serialization + // implementation - we're testing serialization // not "new" here. static void * operator new(size_t s){ ++m_new_calls; @@ -86,7 +86,7 @@ public: static unsigned int m_new_calls; static unsigned int m_delete_calls; // implement class specific new/delete in terms standard - // implementation - we're testing serialization + // implementation - we're testing serialization // not "new" here. static void * operator new(size_t s){ ++m_new_calls; @@ -99,7 +99,7 @@ unsigned int ANew2::m_delete_calls = 0; template int test(){ const char * testfile = boost::archive::tmpnam(NULL); - + BOOST_REQUIRE(NULL != testfile); @@ -110,7 +110,7 @@ int test(){ T *ta1 = NULL; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("ta", ta); diff --git a/test/test_no_rtti.cpp b/test/test_no_rtti.cpp index 48e17da2..38ccd2dc 100644 --- a/test/test_no_rtti.cpp +++ b/test/test_no_rtti.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_no_rtti.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -10,7 +10,7 @@ // extended typeinfo systems. In this example, one class is // identified using the default RTTI while the other uses a custom // system based on the export key. -// +// // As this program uses RTTI for one of the types, the test will fail // on a system for which RTTI is not enabled or not existent. @@ -21,7 +21,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -83,7 +83,7 @@ void load_derived(const char *testfile) boost::serialization::type_info_implementation< polymorphic_derived1 >::type::get_const_instance() - == + == * boost::serialization::type_info_implementation< polymorphic_derived1 >::type::get_const_instance().get_derived_extended_type_info(*rd1) @@ -97,7 +97,7 @@ void load_derived(const char *testfile) boost::serialization::type_info_implementation< polymorphic_derived2 >::type::get_const_instance() - == + == * boost::serialization::type_info_implementation< polymorphic_derived2 >::type::get_const_instance().get_derived_extended_type_info(*rd2) @@ -122,7 +122,7 @@ void load_derived(const char *testfile) boost::serialization::type_info_implementation< polymorphic_derived1 >::type::get_const_instance() - == + == * boost::serialization::type_info_implementation< polymorphic_base >::type::get_const_instance().get_derived_extended_type_info(*rb1) @@ -140,7 +140,7 @@ void load_derived(const char *testfile) boost::serialization::type_info_implementation< polymorphic_derived2 >::type::get_const_instance() - == + == * boost::serialization::type_info_implementation< polymorphic_base >::type::get_const_instance().get_derived_extended_type_info(*rb2) diff --git a/test/test_non_default_ctor.cpp b/test/test_non_default_ctor.cpp index 9a656f18..33780ce8 100644 --- a/test/test_non_default_ctor.cpp +++ b/test/test_non_default_ctor.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_non_default_ctor.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -23,7 +23,7 @@ #if defined(BOOST_NO_STDC_NAMESPACE) namespace std{ - using ::rand; + using ::rand; using ::remove; #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE) using ::numeric_limits; @@ -76,7 +76,7 @@ public: int A::count = 0; -A::A(int i_) : +A::A(int i_) : i(i_), s(static_cast(0xff & std::rand())), t(static_cast(0xff & std::rand())), @@ -95,10 +95,10 @@ A::~A(){ bool A::operator==(const A &rhs) const { return - s == rhs.s - && t == rhs.t - && u == rhs.u - && v == rhs.v + s == rhs.s + && t == rhs.t + && u == rhs.u + && v == rhs.v && std::abs( boost::math::float_distance(w, rhs.w)) < 2 && std::abs( boost::math::float_distance(x, rhs.x)) < 2 ; @@ -111,7 +111,7 @@ bool A::operator<(const A &rhs) const if(! (t == rhs.t) ) return t < rhs.t; if(! (u == rhs.u) ) - return t < rhs.u; + return t < rhs.u; if(! (v == rhs.v) ) return t < rhs.v; if(std::abs( boost::math::float_distance(w, rhs.w)) > 1) @@ -121,13 +121,13 @@ bool A::operator<(const A &rhs) const return false; } -namespace boost { +namespace boost { namespace serialization { template inline void save_construct_data( - Archive & ar, - const A * a, + Archive & ar, + const A * a, const unsigned int /* file_version */ ){ // variable used for construction @@ -136,8 +136,8 @@ inline void save_construct_data( template inline void load_construct_data( - Archive & ar, - A * a, + Archive & ar, + A * a, const unsigned int /* file_version */ ){ int i; @@ -154,7 +154,7 @@ void save(const char * testfile){ A a(2); oa << BOOST_SERIALIZATION_NVP(a); - + // save a copy pointer to this item A *pa1 = &a; oa << BOOST_SERIALIZATION_NVP(pa1); diff --git a/test/test_non_default_ctor2.cpp b/test/test_non_default_ctor2.cpp index 392bb52a..ef855f3a 100644 --- a/test/test_non_default_ctor2.cpp +++ b/test/test_non_default_ctor2.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_non_default_ctor2.cpp -// (C) Copyright 2002 Martin Ecker. +// (C) Copyright 2002 Martin Ecker. // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -92,13 +92,13 @@ private: } }; -namespace boost { +namespace boost { namespace serialization { template void save_construct_data( - ArchiveT& archive, - const A* p, + ArchiveT& archive, + const A* p, const unsigned int /*version*/ ){ archive & boost::serialization::make_nvp("initialValue", p->value); @@ -106,8 +106,8 @@ void save_construct_data( template void load_construct_data( - ArchiveT& archive, - A* p, + ArchiveT& archive, + A* p, const unsigned int /*version*/ ){ IntValueHolder initialValue; @@ -125,7 +125,7 @@ int test_main( int /* argc */, char* /* argv */[] ) BOOST_REQUIRE(NULL != testfile); A* a = new A(5); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << BOOST_SERIALIZATION_NVP(a); diff --git a/test/test_non_intrusive.cpp b/test/test_non_intrusive.cpp index 79dcdfb8..b3c3536c 100644 --- a/test/test_non_intrusive.cpp +++ b/test/test_non_intrusive.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_non_intrursive.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -22,7 +22,7 @@ #if defined(BOOST_NO_STDC_NAMESPACE) namespace std{ - using ::rand; + using ::rand; using ::remove; #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) && !defined(UNDER_CE) using ::numeric_limits; @@ -50,7 +50,7 @@ public: bool operator<(const A & rhs) const; }; -A::A() : +A::A() : s(static_cast(0xff & std::rand())), t(static_cast(0xff & std::rand())), u(std::rand()), @@ -63,10 +63,10 @@ A::A() : bool A::operator==(const A &rhs) const { return - s == rhs.s - && t == rhs.t - && u == rhs.u - && v == rhs.v + s == rhs.s + && t == rhs.t + && u == rhs.u + && v == rhs.v && std::abs( boost::math::float_distance(w, rhs.w)) < 2 && std::abs( boost::math::float_distance(x, rhs.x)) < 2 ; @@ -79,7 +79,7 @@ bool A::operator<(const A &rhs) const if(! (t == rhs.t) ) return t < rhs.t; if(! (u == rhs.u) ) - return t < rhs.u; + return t < rhs.u; if(! (v == rhs.v) ) return t < rhs.v; if(std::abs( boost::math::float_distance(w, rhs.w)) > 1) @@ -93,14 +93,14 @@ bool A::operator<(const A &rhs) const // function specializations must be defined in the appropriate // namespace - boost::serialization -namespace boost { +namespace boost { namespace serialization { // This first set of overrides should work with all compilers. // The last argument is int while the default versions // defined in serialization.hpp have long as the last argument. -// This is part of the work around for compilers that don't +// This is part of the work around for compilers that don't // support correct function template ordering. These functions // are always called with 0 (i.e. an int) as the last argument. // Our specialized versions also have int as the last argument @@ -109,8 +109,8 @@ namespace serialization { // default ones as no argument conversion is required to make a match template void serialize( - Archive & ar, - A & a, + Archive & ar, + A & a, const unsigned int /* file_version */ ){ ar & boost::serialization::make_nvp("s", a.s); @@ -130,7 +130,7 @@ void save(const char * testfile){ A a; oa << BOOST_SERIALIZATION_NVP(a); - + // save a copy pointer to this item A *pa1 = &a; oa << BOOST_SERIALIZATION_NVP(pa1); diff --git a/test/test_not_serializable.cpp b/test/test_not_serializable.cpp index 4833512d..178f383d 100644 --- a/test/test_not_serializable.cpp +++ b/test/test_not_serializable.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_non_serializable.cpp: test implementation level trait -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_null_ptr.cpp b/test/test_null_ptr.cpp index e52631a8..7868799e 100644 --- a/test/test_null_ptr.cpp +++ b/test/test_null_ptr.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_null_ptr.cpp: test implementation level trait -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -49,7 +49,7 @@ void save(const char *testfile) polymorphic_base *rb1 = NULL; polymorphic_derived1 *rd1 = NULL; - + oa << BOOST_SERIALIZATION_NVP(rb1); oa << BOOST_SERIALIZATION_NVP(rd1); } diff --git a/test/test_nvp.cpp b/test/test_nvp.cpp index cd546e01..5390db23 100644 --- a/test/test_nvp.cpp +++ b/test/test_nvp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_nvp.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -34,7 +34,7 @@ test_main( int /* argc */, char* /* argv */[] ) B b, b1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << BOOST_SERIALIZATION_NVP(b); @@ -49,7 +49,7 @@ test_main( int /* argc */, char* /* argv */[] ) B *bptr = &b; B *bptr1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << BOOST_SERIALIZATION_NVP(bptr); diff --git a/test/test_object.cpp b/test/test_object.cpp index acf44e8c..54bdc30b 100644 --- a/test/test_object.cpp +++ b/test/test_object.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_object.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -15,7 +15,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_optional.cpp b/test/test_optional.cpp index 330b2d7e..57905631 100644 --- a/test/test_optional.cpp +++ b/test/test_optional.cpp @@ -15,7 +15,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_p_helper.cpp b/test/test_p_helper.cpp index 0d68588e..a4404e89 100644 --- a/test/test_p_helper.cpp +++ b/test/test_p_helper.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_polymorphic.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_pimpl.cpp b/test/test_pimpl.cpp index b87a8cf2..267bb5d1 100644 --- a/test/test_pimpl.cpp +++ b/test/test_pimpl.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_pimpl.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -31,7 +31,7 @@ int test_main( int argc, char* argv[] ) // BOOST_REQUIRE(NULL != testfile); A a, a1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os); oa << BOOST_SERIALIZATION_NVP(a); diff --git a/test/test_polymorphic.cpp b/test/test_polymorphic.cpp index 33957e1c..46880988 100644 --- a/test/test_polymorphic.cpp +++ b/test/test_polymorphic.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_polymorphic.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -76,7 +76,7 @@ int test_main(int /* argc */, char * /* argv */ []) // test using using polymorphic interface. { test_ostream os(testfile, TEST_STREAM_FLAGS); - boost::archive::polymorphic_oarchive * oa_implementation + boost::archive::polymorphic_oarchive * oa_implementation = new test_oarchive(os, TEST_ARCHIVE_FLAGS); *oa_implementation << BOOST_SERIALIZATION_NVP(d); delete oa_implementation; diff --git a/test/test_polymorphic2.cpp b/test/test_polymorphic2.cpp index 52ee3082..12c27dbe 100644 --- a/test/test_polymorphic2.cpp +++ b/test/test_polymorphic2.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_polymorphic2.cpp -// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_polymorphic2.hpp b/test/test_polymorphic2.hpp index a2cd4f12..c8a041fc 100644 --- a/test/test_polymorphic2.hpp +++ b/test/test_polymorphic2.hpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_polymorphic2.hpp -// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -20,11 +20,11 @@ public: virtual ~A() {} void serialize( - boost::archive::polymorphic_oarchive &ar, + boost::archive::polymorphic_oarchive &ar, const unsigned int /*version*/ ); void serialize( - boost::archive::polymorphic_iarchive &ar, + boost::archive::polymorphic_iarchive &ar, const unsigned int /*version*/ ); @@ -33,11 +33,11 @@ public: struct B : A { void serialize( - boost::archive::polymorphic_oarchive &ar, + boost::archive::polymorphic_oarchive &ar, const unsigned int /*version*/ ); void serialize( - boost::archive::polymorphic_iarchive &ar, + boost::archive::polymorphic_iarchive &ar, const unsigned int /*version*/ ); }; diff --git a/test/test_polymorphic2imp.cpp b/test/test_polymorphic2imp.cpp index e0544e81..cad50dd8 100644 --- a/test/test_polymorphic2imp.cpp +++ b/test/test_polymorphic2imp.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_polymorphic2imp.cpp -// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2009 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -15,13 +15,13 @@ #include "test_polymorphic2.hpp" void A::serialize( - boost::archive::polymorphic_oarchive &ar, + boost::archive::polymorphic_oarchive &ar, const unsigned int /*version*/ ){ ar & BOOST_SERIALIZATION_NVP(i); } void A::serialize( - boost::archive::polymorphic_iarchive &ar, + boost::archive::polymorphic_iarchive &ar, const unsigned int /*version*/ ){ ar & BOOST_SERIALIZATION_NVP(i); @@ -30,13 +30,13 @@ void A::serialize( // BOOST_CLASS_EXPORT(A) void B::serialize( - boost::archive::polymorphic_oarchive &ar, + boost::archive::polymorphic_oarchive &ar, const unsigned int /*version*/ ){ ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(A); } void B::serialize( - boost::archive::polymorphic_iarchive &ar, + boost::archive::polymorphic_iarchive &ar, const unsigned int /*version*/ ){ ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(A); diff --git a/test/test_polymorphic_A.cpp b/test/test_polymorphic_A.cpp index c7c598ca..a4f4d1a0 100644 --- a/test/test_polymorphic_A.cpp +++ b/test/test_polymorphic_A.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_polymorphic_A.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -36,14 +36,14 @@ void data::serialize(Archive & ar, const unsigned int /* file_version */){ #include template void data::serialize( - boost::archive::polymorphic_oarchive & ar, + boost::archive::polymorphic_oarchive & ar, const unsigned int file_version ); #include template void data::serialize( - boost::archive::polymorphic_iarchive & ar, + boost::archive::polymorphic_iarchive & ar, const unsigned int file_version ); #endif diff --git a/test/test_polymorphic_A.hpp b/test/test_polymorphic_A.hpp index 306d6261..839ed27b 100644 --- a/test/test_polymorphic_A.hpp +++ b/test/test_polymorphic_A.hpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_polymorphic_A.hpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_primitive.cpp b/test/test_primitive.cpp index d9585458..02ea7902 100644 --- a/test/test_primitive.cpp +++ b/test/test_primitive.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_primitive.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_priority_queue.cpp b/test/test_priority_queue.cpp index bb4c7cfe..fe763bb9 100644 --- a/test/test_priority_queue.cpp +++ b/test/test_priority_queue.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_priority_queue.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -49,7 +49,7 @@ int test_main( int /* argc */, char* /* argv */[] ) ia >> boost::serialization::make_nvp("a_priority_queue",a_priority_queue1); } BOOST_CHECK(a_priority_queue.size() == a_priority_queue1.size()); - + for(int i = a_priority_queue.size(); i-- > 0;){ const A & a1 = a_priority_queue.top(); const A & a2 = a_priority_queue1.top(); @@ -57,7 +57,7 @@ int test_main( int /* argc */, char* /* argv */[] ) a_priority_queue.pop(); a_priority_queue1.pop(); } - + std::remove(testfile); return EXIT_SUCCESS; } diff --git a/test/test_private_base.cpp b/test/test_private_base.cpp index 38ffefa1..96d8bd0c 100644 --- a/test/test_private_base.cpp +++ b/test/test_private_base.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_private_base.cpp -// (C) Copyright 2009 Eric Moyer - http://www.rrsd.com . +// (C) Copyright 2009 Eric Moyer - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -13,7 +13,7 @@ #include #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -67,7 +67,7 @@ test_main( int /* argc */, char* /* argv */[] ) BOOST_REQUIRE(NULL != testfile); Derived a(1), a1(2); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("a", a); diff --git a/test/test_private_base2.cpp b/test/test_private_base2.cpp index 19476ee2..67d714c4 100644 --- a/test/test_private_base2.cpp +++ b/test/test_private_base2.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_private_base.cpp -// (C) Copyright 2009 Eric Moyer - http://www.rrsd.com . +// (C) Copyright 2009 Eric Moyer - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -13,7 +13,7 @@ #include #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -58,14 +58,14 @@ public: //BOOST_CLASS_EXPORT(Derived) -int +int test_main( int /* argc */, char* /* argv */[] ) { const char * testfile = boost::archive::tmpnam(NULL); BOOST_REQUIRE(NULL != testfile); Derived a(1), a1(2); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("a", a); @@ -84,7 +84,7 @@ test_main( int /* argc */, char* /* argv */[] ) Derived *ta = &a; Derived *ta1 = NULL; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("ta", ta); @@ -97,7 +97,7 @@ test_main( int /* argc */, char* /* argv */[] ) BOOST_CHECK(ta != ta1); BOOST_CHECK(*ta == *ta1); //BOOST_CHECK(*static_cast(ta) == *static_cast(ta1)); - + std::remove(testfile); return 0; diff --git a/test/test_private_ctor.cpp b/test/test_private_ctor.cpp index c8bcdb24..84cc66c7 100644 --- a/test/test_private_ctor.cpp +++ b/test/test_private_ctor.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_private_ctor.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -19,7 +19,7 @@ class V { private: friend int test_main(int /* argc */, char * /* argv */[]); friend class boost::serialization::access; - int m_i; + int m_i; V() : m_i(0) {} diff --git a/test/test_queue.cpp b/test/test_queue.cpp index 9fba14b1..a2d25ef3 100644 --- a/test/test_queue.cpp +++ b/test/test_queue.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_queue.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -48,7 +48,7 @@ int test_main( int /* argc */, char* /* argv */[] ) ia >> boost::serialization::make_nvp("aqueue",aqueue1); } BOOST_CHECK(aqueue == aqueue1); - + std::remove(testfile); return EXIT_SUCCESS; } diff --git a/test/test_recursion.cpp b/test/test_recursion.cpp index a44f293c..b596f383 100644 --- a/test/test_recursion.cpp +++ b/test/test_recursion.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_recurrsion.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -33,7 +33,7 @@ int test_main( int /* argc */, char* /* argv */[] ) J j, j1; j.j = &j; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << BOOST_SERIALIZATION_NVP(j); diff --git a/test/test_registered.cpp b/test/test_registered.cpp index 5a5ccdda..32221964 100644 --- a/test/test_registered.cpp +++ b/test/test_registered.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_registered.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -116,7 +116,7 @@ void load_derived(const char *testfile) BOOST_CHECK_MESSAGE( & boost::serialization::type_info_implementation ::type::get_const_instance() - == + == boost::serialization::type_info_implementation ::type::get_const_instance().get_derived_extended_type_info(*rd2), "restored pointer d2 not of correct type" @@ -224,7 +224,7 @@ int test_main( int /* argc */, char* /* argv */[] ) { const char * testfile = boost::archive::tmpnam(NULL); - + BOOST_REQUIRE(NULL != testfile); save_derived(testfile); diff --git a/test/test_reset_object_address.cpp b/test/test_reset_object_address.cpp index b78d52f8..a3d0195f 100644 --- a/test/test_reset_object_address.cpp +++ b/test/test_reset_object_address.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_reset_object_address.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) namespace std{ - using ::rand; + using ::rand; using ::size_t; } #endif @@ -238,8 +238,8 @@ class G { BOOST_SERIALIZATION_SPLIT_MEMBER() public: bool operator==(const G &rhs) const { - return - m_a1 == rhs.m_a1 + return + m_a1 == rhs.m_a1 && m_a2 == rhs.m_a2 && *m_pa2 == *rhs.m_pa2; } @@ -276,7 +276,7 @@ void test5(){ } // joaquin's test - this tests the case where rest_object_address -// is applied to an item which in fact is not tracked so that +// is applied to an item which in fact is not tracked so that // the call is in fact superfluous. struct foo { diff --git a/test/test_set.cpp b/test/test_set.cpp index 51fef489..826f83a0 100644 --- a/test/test_set.cpp +++ b/test/test_set.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_set.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -25,7 +25,7 @@ namespace std{ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -50,7 +50,7 @@ test_set(){ aset.insert(A()); aset.insert(A()); const A * a_ptr = & * aset.begin(); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("aset", aset); @@ -106,6 +106,6 @@ test_multiset(){ int test_main( int /* argc */, char* /* argv */[] ){ test_set(); test_multiset(); - + return EXIT_SUCCESS; } diff --git a/test/test_set_boost_unordered.cpp b/test/test_set_boost_unordered.cpp index ce29374c..8c5c8ff1 100644 --- a/test/test_set_boost_unordered.cpp +++ b/test/test_set_boost_unordered.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_set.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -25,7 +25,7 @@ namespace std{ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -62,7 +62,7 @@ test_unordered_set(){ A a, a1; anunordered_set.insert(a); anunordered_set.insert(a1); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunordered_set", anunordered_set); @@ -92,7 +92,7 @@ test_unordered_multiset(){ boost::unordered_multiset anunordered_multiset; anunordered_multiset.insert(A()); anunordered_multiset.insert(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunordered_multiset", anunordered_multiset); diff --git a/test/test_set_hashed.cpp b/test/test_set_hashed.cpp index 8379c77f..d60ed628 100644 --- a/test/test_set_hashed.cpp +++ b/test/test_set_hashed.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_set.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -25,7 +25,7 @@ namespace std{ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -49,7 +49,7 @@ test_set(){ std::set aset; aset.insert(A()); aset.insert(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("aset", aset); @@ -61,7 +61,7 @@ test_set(){ ia >> boost::serialization::make_nvp("aset", aset1); } BOOST_CHECK(aset == aset1); - std::remove(testfile); + std::remove(testfile); } void @@ -72,7 +72,7 @@ test_multiset(){ std::multiset amultiset; amultiset.insert(A()); amultiset.insert(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("amultiset", amultiset); @@ -110,7 +110,7 @@ test_hash_set(){ A a, a1; ahash_set.insert(a); ahash_set.insert(a1); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("ahash_set", ahash_set); @@ -140,7 +140,7 @@ test_hash_multiset(){ BOOST_STD_EXTENSION_NAMESPACE::hash_multiset ahash_multiset; ahash_multiset.insert(A()); ahash_multiset.insert(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("ahash_multiset", ahash_multiset); @@ -189,7 +189,7 @@ test_unordered_set(){ A a, a1; anunordered_set.insert(a); anunordered_set.insert(a1); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunordered_set", anunordered_set); @@ -219,7 +219,7 @@ test_unordered_multiset(){ std::unordered_multiset anunordered_multiset; anunordered_multiset.insert(A()); anunordered_multiset.insert(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunordered_multiset", anunordered_multiset); @@ -247,16 +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_HDR_UNORDERED_SET test_unordered_set(); test_unordered_multiset(); #endif - + return EXIT_SUCCESS; } diff --git a/test/test_set_unordered.cpp b/test/test_set_unordered.cpp index 31ec256a..b8453bcf 100644 --- a/test/test_set_unordered.cpp +++ b/test/test_set_unordered.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_set.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // (C) Copyright 2014 Jim Bell // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at @@ -25,7 +25,7 @@ namespace std{ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -62,7 +62,7 @@ test_unordered_set(){ A a, a1; anunordered_set.insert(a); anunordered_set.insert(a1); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunordered_set", anunordered_set); @@ -92,7 +92,7 @@ test_unordered_multiset(){ std::unordered_multiset anunordered_multiset; anunordered_multiset.insert(A()); anunordered_multiset.insert(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("anunordered_multiset", anunordered_multiset); diff --git a/test/test_shared_ptr.cpp b/test/test_shared_ptr.cpp index 2b4a8b1f..dc35842b 100644 --- a/test/test_shared_ptr.cpp +++ b/test/test_shared_ptr.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_shared_ptr.cpp -// (C) Copyright 2002 Robert Ramey- http://www.rrsd.com - David Tonge . +// (C) Copyright 2002 Robert Ramey- http://www.rrsd.com - David Tonge . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -129,7 +129,7 @@ void save_and_load(SP & spa) template void save2( - const char * testfile, + const char * testfile, const SP & first, const SP & second ){ @@ -141,7 +141,7 @@ void save2( template void load2( - const char * testfile, + const char * testfile, SP & first, SP & second) { @@ -174,7 +174,7 @@ void save_and_load2(SP & first, SP & second) template void save3( - const char * testfile, + const char * testfile, SP & first, SP & second, WP & third @@ -188,7 +188,7 @@ void save3( template void load3( - const char * testfile, + const char * testfile, SP & first, SP & second, WP & third @@ -275,7 +275,7 @@ bool test(){ // trivial test 1 save_and_load(spa); - + //trivival test 2 spa = SPT(new A); save_and_load(spa); @@ -295,7 +295,7 @@ bool test(){ spa1 = spa; WPT wp = spa; save_and_load3(spa, spa1, wp); - + // obj of type B gets destroyed // as smart_ptr goes out of scope } diff --git a/test/test_shared_ptr_132.cpp b/test/test_shared_ptr_132.cpp index f0faaa86..0d11b000 100644 --- a/test/test_shared_ptr_132.cpp +++ b/test/test_shared_ptr_132.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_shared_ptr.cpp -// (C) Copyright 2002 Robert Ramey- http://www.rrsd.com - David Tonge . +// (C) Copyright 2002 Robert Ramey- http://www.rrsd.com - David Tonge . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -108,7 +108,7 @@ void save_and_load(const T & spa) BOOST_REQUIRE(NULL != testfile); save(testfile, spa); - // note that we're loading to a current version of shared_ptr + // note that we're loading to a current version of shared_ptr // regardless of the orignal saved type - this tests backward // archive compatibility boost::shared_ptr spa1; @@ -123,8 +123,8 @@ void save_and_load(const T & spa) template void save2( - const char * testfile, - const T & first, + const char * testfile, + const T & first, const T & second ){ test_ostream os(testfile, TEST_STREAM_FLAGS); @@ -135,8 +135,8 @@ void save2( template void load2( - const char * testfile, - T & first, + const char * testfile, + T & first, T & second) { test_istream is(testfile, TEST_STREAM_FLAGS); @@ -169,8 +169,8 @@ void save_and_load2(T & first, T & second) template void save3( - const char * testfile, - const T & first, + const char * testfile, + const T & first, const T & second, const T & third ){ @@ -183,8 +183,8 @@ void save3( template void load3( - const char * testfile, - T & first, + const char * testfile, + T & first, T & second, T & third ){ @@ -216,7 +216,7 @@ int test_main(int /* argc */, char * /* argv */[]) spa = boost_132::shared_ptr(new A); boost_132::shared_ptr spa1 = spa; save_and_load2(spa, spa1); - + // Try to save and load pointers to Bs, to a text archive spa = boost_132::shared_ptr(new B); save_and_load(spa); diff --git a/test/test_shared_ptr_multi_base.cpp b/test/test_shared_ptr_multi_base.cpp index 7060f080..2ebab981 100644 --- a/test/test_shared_ptr_multi_base.cpp +++ b/test/test_shared_ptr_multi_base.cpp @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -82,7 +82,7 @@ struct Sub:public Base1, public Base2, public Base3 { Base1(x), Base2(x), m_x(x) - { + { ++count; } Sub(const Sub & rhs) : @@ -115,8 +115,8 @@ int Sub::count = 0; template void save2( - const char * testfile, - const FIRST& first, + const char * testfile, + const FIRST& first, const SECOND& second ){ test_ostream os(testfile, TEST_STREAM_FLAGS); @@ -127,8 +127,8 @@ void save2( template void load2( - const char * testfile, - FIRST& first, + const char * testfile, + FIRST& first, SECOND& second) { test_istream is(testfile, TEST_STREAM_FLAGS); @@ -168,7 +168,7 @@ void shared_weak( const char * testfile = boost::archive::tmpnam(NULL); BOOST_REQUIRE(NULL != testfile); int firstm = first->m_x; - + BOOST_REQUIRE(! second.expired()); int secondm = second.lock()->m_x; save2(testfile, first, second); diff --git a/test/test_simple_class.cpp b/test/test_simple_class.cpp index 8d396d45..41c8cb21 100644 --- a/test/test_simple_class.cpp +++ b/test/test_simple_class.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_simple_class.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -19,7 +19,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -56,18 +56,18 @@ bool A::check_equal(const A &rhs) const BOOST_CHECK(!(0 != y.compare(rhs.y))); #ifndef BOOST_NO_STD_WSTRING BOOST_CHECK(!(0 != z.compare(rhs.z))); - #endif + #endif return true; } -int +int test_main( int /* argc */, char* /* argv */[] ) { const char * testfile = boost::archive::tmpnam(NULL); BOOST_REQUIRE(NULL != testfile); A a, a1; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("a", a); diff --git a/test/test_simple_class_ptr.cpp b/test/test_simple_class_ptr.cpp index 6d7e95d7..795e9a6f 100644 --- a/test/test_simple_class_ptr.cpp +++ b/test/test_simple_class_ptr.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_simple_class_ptr.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -27,13 +27,13 @@ namespace std{ int test_main( int /* argc */, char* /* argv */[] ) { const char * testfile = boost::archive::tmpnam(NULL); - + BOOST_REQUIRE(NULL != testfile); const A *ta = new A(); A *ta1 = NULL; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("ta", ta); diff --git a/test/test_singleton.cpp b/test/test_singleton.cpp index 822f0b7b..5d3b88df 100644 --- a/test/test_singleton.cpp +++ b/test/test_singleton.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_singleton.cpp -// (C) Copyright 2018 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2018 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_slist.cpp b/test/test_slist.cpp index 3cac92e2..9c387106 100644 --- a/test/test_slist.cpp +++ b/test/test_slist.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_list.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -31,7 +31,7 @@ void test_slist(){ BOOST_STD_EXTENSION_NAMESPACE::slist aslist; aslist.push_front(A()); aslist.push_front(A()); - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("aslist", aslist); diff --git a/test/test_slist_ptrs.cpp b/test/test_slist_ptrs.cpp index 3325510a..e4d830be 100644 --- a/test/test_slist_ptrs.cpp +++ b/test/test_slist_ptrs.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_list.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -50,7 +50,7 @@ void test_slist(){ BOOST_REQUIRE(NULL != testfile); BOOST_STD_EXTENSION_NAMESPACE::slist aslist; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); aslist.push_front(new A); @@ -67,15 +67,15 @@ void test_slist(){ ); } std::for_each( - aslist.begin(), - aslist.end(), + aslist.begin(), + aslist.end(), boost::checked_deleter() ); std::for_each( - aslist1.begin(), - aslist1.end(), + aslist1.begin(), + aslist1.end(), boost::checked_deleter() - ); + ); std::remove(testfile); } diff --git a/test/test_smart_cast.cpp b/test/test_smart_cast.cpp index 9cb50aef..97272ad6 100644 --- a/test/test_smart_cast.cpp +++ b/test/test_smart_cast.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 -// test_smart_cast.cpp: +// test_smart_cast.cpp: -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_split.cpp b/test/test_split.cpp index 98015053..9350272f 100644 --- a/test/test_split.cpp +++ b/test/test_split.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_split.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -29,14 +29,14 @@ class A friend class boost::serialization::access; template void save( - Archive & /* ar */, + Archive & /* ar */, const unsigned int /* file_version */ ) const { ++(const_cast(*this).count); } template void load( - Archive & /* ar */, + Archive & /* ar */, const unsigned int /* file_version */ ){ --count; @@ -55,14 +55,14 @@ class B friend class boost::serialization::access; template void save( - Archive & /* ar */, + Archive & /* ar */, const unsigned int /* file_version */ ) const { ++(const_cast(*this).count); } template void load( - Archive & /* ar */, + Archive & /* ar */, const unsigned int /* file_version */ ){ --count; @@ -77,7 +77,7 @@ public: // function specializations must be defined in the appropriate // namespace - boost::serialization -namespace boost { +namespace boost { namespace serialization { template @@ -85,9 +85,9 @@ void serialize( Archive & ar, B & b, const unsigned int file_version -){ +){ boost::serialization::split_member(ar, b, file_version); -} +} } // serialization } // namespace boost @@ -102,12 +102,12 @@ public: } }; -namespace boost { +namespace boost { namespace serialization { template void save( - Archive & /* ar */, + Archive & /* ar */, const C & c, const unsigned int /* file_version */ ){ @@ -116,7 +116,7 @@ void save( template void load( - Archive & /* ar */, + Archive & /* ar */, C & c, const unsigned int /* file_version */ ){ diff --git a/test/test_stack.cpp b/test/test_stack.cpp index 6d54f7b2..4d0ee27b 100644 --- a/test/test_stack.cpp +++ b/test/test_stack.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_stack.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -48,7 +48,7 @@ int test_main( int /* argc */, char* /* argv */[] ) ia >> boost::serialization::make_nvp("astack",astack1); } BOOST_CHECK(astack == astack1); - + std::remove(testfile); return EXIT_SUCCESS; } diff --git a/test/test_tools.hpp b/test/test_tools.hpp index ed45ee0b..09c0c1c3 100644 --- a/test/test_tools.hpp +++ b/test/test_tools.hpp @@ -12,7 +12,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_tools.hpp // -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -27,7 +27,7 @@ #if defined(UNDER_CE) -// Windows CE does not supply the tmpnam function in its CRT. +// Windows CE does not supply the tmpnam function in its CRT. // Substitute a primitive implementation here. namespace boost { namespace archive { @@ -45,13 +45,13 @@ namespace archive { #elif defined(_WIN32) || defined(__WIN32__) || defined(WIN32) // win32 has a brain-dead tmpnam implementation. -// which leaves temp files in root directory +// which leaves temp files in root directory // regardless of environmental settings #include #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; using ::strcpy; using ::strcat; @@ -116,9 +116,9 @@ namespace archive { // citing the tmpnam(3S) manpage, "the operation is not performed and a // NULL pointer is returned". tempnam does not have this restriction, so, // let's use tempnam instead. - + #define tmpnam(X) tempnam(NULL,X) - + namespace boost { namespace archive { using ::tmpnam; @@ -182,7 +182,7 @@ inline void msg_impl(char const * msg, char const * file, int line, char const * #define BOOST_CHECKPOINT( M ) \ BOOST_WARN_MESSAGE( true , (M) ) -//#define BOOST_TEST_DONT_PRINT_LOG_VALUE( T ) +//#define BOOST_TEST_DONT_PRINT_LOG_VALUE( T ) #define BOOST_FAIL( M ) BOOST_REQUIRE_MESSAGE( false, (M) ) #define EXIT_SUCCESS 0 diff --git a/test/test_tracking.cpp b/test/test_tracking.cpp index 9f4b47c0..24e6f009 100644 --- a/test/test_tracking.cpp +++ b/test/test_tracking.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_tracking_save.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include #include // remove #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_traits_fail.cpp b/test/test_traits_fail.cpp index 2b8a728f..6816528b 100644 --- a/test/test_traits_fail.cpp +++ b/test/test_traits_fail.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_traits_fail.cpp: test implementation level trait -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -16,12 +16,12 @@ class A }; BOOST_CLASS_IMPLEMENTATION(A, boost::serialization::not_serializable) -// It can make no sense to assign a version number to a class that +// It can make no sense to assign a version number to a class that // is not serialized with class information BOOST_CLASS_VERSION(A, 2) // should fail during compile -// It can make no sense to assign tracking behavior to a class that +// It can make no sense to assign tracking behavior to a class that // is not serializable. Should fail during compile. -BOOST_CLASS_TRACKING(A, boost::serialization::track_never) +BOOST_CLASS_TRACKING(A, boost::serialization::track_never) class B { diff --git a/test/test_traits_pass.cpp b/test/test_traits_pass.cpp index 2e650034..d4a16e9e 100644 --- a/test/test_traits_pass.cpp +++ b/test/test_traits_pass.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_traits_pass.cpp: test implementation level trait -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/test_unique_ptr.cpp b/test/test_unique_ptr.cpp index f4f63d5e..c465ea3c 100644 --- a/test/test_unique_ptr.cpp +++ b/test/test_unique_ptr.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_unique_ptr.cpp -// (C) Copyright 2002-14 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-14 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -10,7 +10,7 @@ #include // remove, std::auto_ptr interface wrong in dinkumware #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif diff --git a/test/test_unregistered.cpp b/test/test_unregistered.cpp index 09cb778d..c7de75ee 100644 --- a/test/test_unregistered.cpp +++ b/test/test_unregistered.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_unregistered.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -15,7 +15,7 @@ #include // strcmp #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -133,7 +133,7 @@ void save_unregistered2(const char *testfile) test_oarchive oa(os, TEST_ARCHIVE_FLAGS); polymorphic_derived1 *rd1 = new polymorphic_derived1; - + // registration is NOT necessary when serializing a polymorphic class // through pointer to a derived class bool except = false; @@ -159,7 +159,7 @@ void load_unregistered2(const char *testfile) test_iarchive ia(is, TEST_ARCHIVE_FLAGS); polymorphic_derived1 *rd1 = NULL; - + // registration is NOT necessary when serializing a polymorphic class // or through pointer to a derived class bool except = false; @@ -169,7 +169,7 @@ void load_unregistered2(const char *testfile) BOOST_CATCH(boost::archive::archive_exception const& aex){ except = true; BOOST_CHECK_MESSAGE( - NULL == rd1, + NULL == rd1, "failed load resulted in a non-null pointer" ); } @@ -192,7 +192,7 @@ void save_registered(const char *testfile) // through a pointer to a base class oa.register_type(static_cast(NULL)); oa.register_type(static_cast(NULL)); - oa << BOOST_SERIALIZATION_NVP(rb1); + oa << BOOST_SERIALIZATION_NVP(rb1); oa << BOOST_SERIALIZATION_NVP(rb2); delete rb1; @@ -220,7 +220,7 @@ void load_registered(const char *testfile) boost::serialization::type_info_implementation< polymorphic_derived1 >::type::get_const_instance() - == + == * boost::serialization::type_info_implementation< polymorphic_base >::type::get_const_instance().get_derived_extended_type_info(*rb1), @@ -233,7 +233,7 @@ void load_registered(const char *testfile) boost::serialization::type_info_implementation< polymorphic_derived2 >::type::get_const_instance() - == + == * boost::serialization::type_info_implementation< polymorphic_base >::type::get_const_instance().get_derived_extended_type_info(*rb2), diff --git a/test/test_valarray.cpp b/test/test_valarray.cpp index 391f59f5..84d5c30d 100644 --- a/test/test_valarray.cpp +++ b/test/test_valarray.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_valarrray.cpp -// (C) Copyright 2005 Matthias Troyer . +// (C) Copyright 2005 Matthias Troyer . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -32,7 +32,7 @@ int test_main( int /* argc */, char* /* argv */[] ) std::valarray avalarray(2); avalarray[0] = 42; avalarray[1] = -42; - { + { test_ostream os(testfile, TEST_STREAM_FLAGS); test_oarchive oa(os, TEST_ARCHIVE_FLAGS); oa << boost::serialization::make_nvp("avalarray", avalarray); @@ -43,11 +43,11 @@ int test_main( int /* argc */, char* /* argv */[] ) test_iarchive ia(is, TEST_ARCHIVE_FLAGS); ia >> boost::serialization::make_nvp("avalarray", avalarray1); } - bool equal = ( avalarray.size() == avalarray1.size() + bool equal = ( avalarray.size() == avalarray1.size() && avalarray[0] == avalarray1[0] && avalarray[1] == avalarray1[1] ); - + BOOST_CHECK(equal); std::remove(testfile); return EXIT_SUCCESS; diff --git a/test/test_variant.cpp b/test/test_variant.cpp index 395def61..dcf91d13 100644 --- a/test/test_variant.cpp +++ b/test/test_variant.cpp @@ -2,7 +2,7 @@ // test_variant.cpp // test of non-intrusive serialization of variant types // -// copyright (c) 2005 +// copyright (c) 2005 // troy d. straszheim // http://www.resophonic.com // @@ -21,7 +21,7 @@ #include #include // float_distance #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -66,7 +66,7 @@ public: }; template - bool operator()( const T & t, const U & u) const + bool operator()( const T & t, const U & u) const { typedef typename boost::mpl::eval_if, boost::mpl::identity, @@ -151,7 +151,7 @@ struct H { namespace boost { namespace serialization { - + template void serialize(Archive &ar, H & h, const unsigned int /*file_version*/){ ar & boost::serialization::make_nvp("h", h.i); diff --git a/test/test_vector.cpp b/test/test_vector.cpp index 130ddab4..1064c92e 100644 --- a/test/test_vector.cpp +++ b/test/test_vector.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_vector.cpp -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -14,7 +14,7 @@ #include // remove #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -82,7 +82,7 @@ public: template inline void save_construct_data( - Archive & ar, + Archive & ar, const X * x, const unsigned int /* file_version */ ){ @@ -92,7 +92,7 @@ inline void save_construct_data( template inline void load_construct_data( - Archive & ar, + Archive & ar, X * x, const unsigned int /* file_version */ ){ diff --git a/test/test_void_cast.cpp b/test/test_void_cast.cpp index 8fdd6d8d..1538ab2b 100644 --- a/test/test_void_cast.cpp +++ b/test/test_void_cast.cpp @@ -1,7 +1,7 @@ /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // test_void_cast.cpp: test implementation of run-time casting of void pointers -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -64,9 +64,9 @@ test_main( int /* argc */, char* /* argv */[] ) BOOST_CHECK(vpb1 == boost::serialization::void_upcast( eti(), eti(), - vpd + vpd )); - BOOST_CHECK(vpd == boost::serialization::void_downcast( + BOOST_CHECK(vpd == boost::serialization::void_downcast( eti(), eti(), vpb2 @@ -76,7 +76,7 @@ test_main( int /* argc */, char* /* argv */[] ) eti(), vpd )); - BOOST_CHECK(vpmd == boost::serialization::void_downcast( + BOOST_CHECK(vpmd == boost::serialization::void_downcast( eti(), eti(), vpd @@ -87,7 +87,7 @@ test_main( int /* argc */, char* /* argv */[] ) vpmd )); // note relationship between MostDerived and Base1 is automatically derived - BOOST_CHECK(vpmd == boost::serialization::void_downcast( + BOOST_CHECK(vpmd == boost::serialization::void_downcast( eti(), eti(), vpb1 @@ -99,7 +99,7 @@ test_main( int /* argc */, char* /* argv */[] ) )); // note relationship between MostDerived and Base2 is automatically derived - BOOST_CHECK(vpmd == boost::serialization::void_downcast( + BOOST_CHECK(vpmd == boost::serialization::void_downcast( eti(), eti(), vpb2 @@ -114,7 +114,7 @@ test_main( int /* argc */, char* /* argv */[] ) // for and explanation. These should still work though. // need to double check to validate speed up optimization of derivations - BOOST_CHECK(vpmd == boost::serialization::void_downcast( + BOOST_CHECK(vpmd == boost::serialization::void_downcast( eti(), eti(), vpb1 diff --git a/test/test_z.cpp b/test/test_z.cpp index b3f7c13f..000d93a0 100644 --- a/test/test_z.cpp +++ b/test/test_z.cpp @@ -91,7 +91,7 @@ int main() #include #if defined(BOOST_NO_STDC_NAMESPACE) -namespace std{ +namespace std{ using ::remove; } #endif @@ -247,7 +247,7 @@ int main(int argc, char **argv) { #include #include - + namespace bai = boost::archive::iterators; int main() { @@ -548,7 +548,7 @@ int main() "FuZCB0aGUgZXhlY3V0aW9uZXIgcmFuIHdpbGRseSB1cCBhbmQgZG93biBsb29raW5nIGZvciBpdCwgd2hpbGUgdGhlIHJlc3Qgb2YgdGhlIHBh" "cnR5IHdlbnQgYmFjayB0byB0aGUgZ2FtZS4="; using it_base64_t = bai::base64_from_binary>; - + auto writePaddChars = (3 - input.length() % 3) % 3; std::string base64(it_base64_t(input.begin()), it_base64_t(input.end())); base64.append(writePaddChars, '='); @@ -636,7 +636,7 @@ protected: friend class boost::archive::detail::common_iarchive; friend class boost::archive::basic_xml_iarchive; friend class boost::archive::load_access; - + using boost::archive::xml_iarchive_impl::load; void load(double & t) { @@ -664,7 +664,7 @@ protected: boost::serialization::throw_exception( boost::archive::archive_exception(boost::archive::archive_exception::input_stream_error)); } - + public: xml_iarchive_nan(std::istream & is, unsigned int flags = 0) : boost::archive::xml_iarchive_impl(is, flags) @@ -683,7 +683,7 @@ namespace boost template class detail::common_iarchive; template class basic_xml_iarchive; template class xml_iarchive_impl; - + } } diff --git a/test/text_archive.hpp b/test/text_archive.hpp index 65425ce5..8e98926c 100644 --- a/test/text_archive.hpp +++ b/test/text_archive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/text_warchive.hpp b/test/text_warchive.hpp index 8f77bf2d..e556ef3f 100644 --- a/test/text_warchive.hpp +++ b/test/text_warchive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/xml_archive.hpp b/test/xml_archive.hpp index c7ca3433..a84bc18e 100644 --- a/test/xml_archive.hpp +++ b/test/xml_archive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) diff --git a/test/xml_warchive.hpp b/test/xml_warchive.hpp index 22e4dba6..ffdc4583 100644 --- a/test/xml_warchive.hpp +++ b/test/xml_warchive.hpp @@ -1,4 +1,4 @@ -// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . +// (C) Copyright 2002-4 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to the Boost Software // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt)