From 6ca19892bef474505377f07b028ffe3ed1de9ec3 Mon Sep 17 00:00:00 2001 From: Bryce Adelstein-Lelbach Date: Fri, 12 Nov 2010 03:56:29 +0000 Subject: [PATCH] assert -> BOOST_ASSERT [SVN r66514] --- include/boost/archive/archive_exception.hpp | 2 +- include/boost/archive/basic_archive.hpp | 12 ++++++------ .../boost/archive/basic_binary_iprimitive.hpp | 8 ++++---- include/boost/archive/basic_binary_oarchive.hpp | 2 +- .../boost/archive/basic_binary_oprimitive.hpp | 10 +++++----- include/boost/archive/basic_text_iprimitive.hpp | 2 +- include/boost/archive/basic_text_oarchive.hpp | 2 +- include/boost/archive/basic_text_oprimitive.hpp | 4 ++-- .../boost/archive/detail/basic_serializer.hpp | 4 ++-- include/boost/archive/detail/oserializer.hpp | 8 ++++---- .../boost/archive/impl/basic_binary_iarchive.ipp | 2 +- .../archive/impl/basic_binary_iprimitive.ipp | 2 +- .../boost/archive/impl/basic_binary_oarchive.ipp | 2 +- .../boost/archive/impl/basic_text_iprimitive.ipp | 2 +- .../boost/archive/impl/basic_text_oarchive.ipp | 4 ++-- .../boost/archive/impl/basic_xml_iarchive.ipp | 2 +- .../boost/archive/impl/xml_wiarchive_impl.ipp | 2 +- .../boost/archive/iterators/base64_exception.hpp | 4 ++-- .../archive/iterators/base64_from_binary.hpp | 4 ++-- .../archive/iterators/binary_from_base64.hpp | 2 +- include/boost/archive/iterators/dataflow.hpp | 4 ++-- .../archive/iterators/dataflow_exception.hpp | 4 ++-- include/boost/archive/iterators/escape.hpp | 2 +- .../archive/iterators/insert_linebreaks.hpp | 2 +- .../boost/archive/iterators/mb_from_wchar.hpp | 8 ++++---- .../archive/iterators/remove_whitespace.hpp | 2 +- include/boost/archive/iterators/unescape.hpp | 2 +- .../boost/archive/iterators/wchar_from_mb.hpp | 2 +- include/boost/archive/iterators/xml_escape.hpp | 2 +- include/boost/archive/iterators/xml_unescape.hpp | 2 +- .../archive/iterators/xml_unescape_exception.hpp | 2 +- include/boost/archive/tmpdir.hpp | 4 ++-- include/boost/archive/xml_archive_exception.hpp | 2 +- include/boost/serialization/binary_object.hpp | 2 +- .../boost/serialization/collections_load_imp.hpp | 2 +- .../boost/serialization/extended_type_info.hpp | 2 +- .../serialization/extended_type_info_no_rtti.hpp | 6 +++--- .../serialization/extended_type_info_typeid.hpp | 4 ++-- include/boost/serialization/factory.hpp | 2 +- .../boost/serialization/item_version_type.hpp | 4 ++-- include/boost/serialization/singleton.hpp | 6 +++--- src/archive_exception.cpp | 4 ++-- src/basic_iarchive.cpp | 10 +++++----- src/basic_oarchive.cpp | 16 ++++++++-------- src/basic_serializer_map.cpp | 2 +- src/extended_type_info.cpp | 16 ++++++++-------- src/extended_type_info_no_rtti.cpp | 10 +++++----- src/extended_type_info_typeid.cpp | 8 ++++---- src/shared_ptr_helper.cpp | 2 +- src/void_cast.cpp | 10 +++++----- src/xml_archive_exception.cpp | 4 ++-- 51 files changed, 114 insertions(+), 114 deletions(-) diff --git a/include/boost/archive/archive_exception.hpp b/include/boost/archive/archive_exception.hpp index 242f7528..b5f33f68 100644 --- a/include/boost/archive/archive_exception.hpp +++ b/include/boost/archive/archive_exception.hpp @@ -17,7 +17,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include -#include +#include #include #include diff --git a/include/boost/archive/basic_archive.hpp b/include/boost/archive/basic_archive.hpp index b6769ddd..37f45b69 100644 --- a/include/boost/archive/basic_archive.hpp +++ b/include/boost/archive/basic_archive.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include #include // size_t #include @@ -44,7 +44,7 @@ private: public: library_version_type(): t(0) {}; explicit library_version_type(const unsigned int & t_) : t(t_){ - assert(t_ <= boost::integer_traits::const_max); + BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } library_version_type(const library_version_type & t_) : t(t_.t) @@ -80,7 +80,7 @@ public: // should be private - but MPI fails if it's not!!! version_type(): t(0) {}; explicit version_type(const unsigned int & t_) : t(t_){ - assert(t_ <= boost::integer_traits::const_max); + BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } version_type(const version_type & t_) : t(t_.t) @@ -113,10 +113,10 @@ public: // should be private - but then can't use BOOST_STRONG_TYPE below class_id_type() : t(0) {}; explicit class_id_type(const int t_) : t(t_){ - assert(t_ <= boost::integer_traits::const_max); + BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } explicit class_id_type(const std::size_t t_) : t(t_){ - // assert(t_ <= boost::integer_traits::const_max); + // BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } class_id_type(const class_id_type & t_) : t(t_.t) @@ -151,7 +151,7 @@ private: public: object_id_type(): t(0) {}; explicit object_id_type(const unsigned int & t_) : t(t_){ - assert(t_ <= boost::integer_traits::const_max); + BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } object_id_type(const object_id_type & t_) : t(t_.t) diff --git a/include/boost/archive/basic_binary_iprimitive.hpp b/include/boost/archive/basic_binary_iprimitive.hpp index a5b6bd4a..fc27123d 100644 --- a/include/boost/archive/basic_binary_iprimitive.hpp +++ b/include/boost/archive/basic_binary_iprimitive.hpp @@ -28,7 +28,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include -#include +#include #include #include // std::memcpy #include // std::size_t @@ -95,7 +95,7 @@ public: void load(bool & t){ load_binary(& t, sizeof(t)); int i = t; - assert(0 == i || 1 == i); + BOOST_ASSERT(0 == i || 1 == i); (void)i; // warning suppression for release builds. } BOOST_ARCHIVE_OR_WARCHIVE_DECL(void) @@ -151,7 +151,7 @@ basic_binary_iprimitive::load_binary( std::size_t count ){ // note: an optimizer should eliminate the following for char files - assert( + BOOST_ASSERT( static_cast(count / sizeof(Elem)) <= boost::integer_traits::const_max ); @@ -165,7 +165,7 @@ basic_binary_iprimitive::load_binary( archive_exception(archive_exception::input_stream_error) ); // note: an optimizer should eliminate the following for char files - assert(count % sizeof(Elem) <= boost::integer_traits::const_max); + BOOST_ASSERT(count % sizeof(Elem) <= boost::integer_traits::const_max); s = static_cast(count % sizeof(Elem)); if(0 < s){ // if(is.fail()) diff --git a/include/boost/archive/basic_binary_oarchive.hpp b/include/boost/archive/basic_binary_oarchive.hpp index 5321bf0b..01622b9f 100644 --- a/include/boost/archive/basic_binary_oarchive.hpp +++ b/include/boost/archive/basic_binary_oarchive.hpp @@ -23,7 +23,7 @@ // IN GENERAL, ARCHIVES CREATED WITH THIS CLASS WILL NOT BE READABLE // ON PLATFORM APART FROM THE ONE THEY ARE CREATE ON -#include +#include #include #include #include diff --git a/include/boost/archive/basic_binary_oprimitive.hpp b/include/boost/archive/basic_binary_oprimitive.hpp index fb048588..53e44e4f 100644 --- a/include/boost/archive/basic_binary_oprimitive.hpp +++ b/include/boost/archive/basic_binary_oprimitive.hpp @@ -24,7 +24,7 @@ // ON PLATFORM APART FROM THE ONE THEY ARE CREATE ON #include -#include +#include #include #include // basic_streambuf #include @@ -88,7 +88,7 @@ public: // trap usage of invalid uninitialized boolean which would // otherwise crash on load. void save(const bool t){ - assert(0 == static_cast(t) || 1 == static_cast(t)); + BOOST_ASSERT(0 == static_cast(t) || 1 == static_cast(t)); save_binary(& t, sizeof(t)); } BOOST_ARCHIVE_OR_WARCHIVE_DECL(void) @@ -146,7 +146,7 @@ basic_binary_oprimitive::save_binary( const void *address, std::size_t count ){ - //assert( + //BOOST_ASSERT( // static_cast((std::numeric_limits::max)()) >= count //); // note: if the following assertions fail @@ -160,7 +160,7 @@ basic_binary_oprimitive::save_binary( // figure number of elements to output - round up count = ( count + sizeof(Elem) - 1) / sizeof(Elem); - assert(count <= std::size_t(boost::integer_traits::const_max)); + BOOST_ASSERT(count <= std::size_t(boost::integer_traits::const_max)); std::streamsize scount = m_sb.sputn( static_cast(address), static_cast(count) @@ -173,7 +173,7 @@ basic_binary_oprimitive::save_binary( // static_cast(address), // count //); - //assert(os.good()); + //BOOST_ASSERT(os.good()); } } //namespace boost diff --git a/include/boost/archive/basic_text_iprimitive.hpp b/include/boost/archive/basic_text_iprimitive.hpp index 67ba7db3..b927ec91 100644 --- a/include/boost/archive/basic_text_iprimitive.hpp +++ b/include/boost/archive/basic_text_iprimitive.hpp @@ -24,7 +24,7 @@ // in such cases. So we can't use basic_ostream but rather // use two template parameters -#include +#include #include #include // size_t diff --git a/include/boost/archive/basic_text_oarchive.hpp b/include/boost/archive/basic_text_oarchive.hpp index f6ec5342..dd10f659 100644 --- a/include/boost/archive/basic_text_oarchive.hpp +++ b/include/boost/archive/basic_text_oarchive.hpp @@ -24,7 +24,7 @@ // in such cases. So we can't use basic_ostream but rather // use two template parameters -#include +#include #include #include #include diff --git a/include/boost/archive/basic_text_oprimitive.hpp b/include/boost/archive/basic_text_oprimitive.hpp index c0e884aa..06885ad3 100644 --- a/include/boost/archive/basic_text_oprimitive.hpp +++ b/include/boost/archive/basic_text_oprimitive.hpp @@ -27,7 +27,7 @@ #include #include #include // isnan -#include +#include #include // size_t #include @@ -97,7 +97,7 @@ public: void save(const bool t){ // trap usage of invalid uninitialized boolean which would // otherwise crash on load. - assert(0 == static_cast(t) || 1 == static_cast(t)); + BOOST_ASSERT(0 == static_cast(t) || 1 == static_cast(t)); if(os.fail()) boost::serialization::throw_exception( archive_exception(archive_exception::output_stream_error) diff --git a/include/boost/archive/detail/basic_serializer.hpp b/include/boost/archive/detail/basic_serializer.hpp index ab2ffe9d..5dbd8865 100644 --- a/include/boost/archive/detail/basic_serializer.hpp +++ b/include/boost/archive/detail/basic_serializer.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // NULL #include @@ -42,7 +42,7 @@ protected: ) : m_eti(& eti) { - assert(NULL != & eti); + BOOST_ASSERT(NULL != & eti); } public: inline bool diff --git a/include/boost/archive/detail/oserializer.hpp b/include/boost/archive/detail/oserializer.hpp index e676f636..521dc7c4 100644 --- a/include/boost/archive/detail/oserializer.hpp +++ b/include/boost/archive/detail/oserializer.hpp @@ -22,7 +22,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // NULL #include @@ -186,7 +186,7 @@ BOOST_DLLEXPORT void pointer_oserializer::save_object_ptr( basic_oarchive & ar, const void * x ) const { - assert(NULL != x); + BOOST_ASSERT(NULL != x); // make sure call is routed through the highest interface that might // be specialized by the user. T * t = static_cast(const_cast(x)); @@ -384,7 +384,7 @@ struct save_pointer_type { // retrieve the true type of the object pointed to // if this assertion fails its an error in this library - assert(NULL != this_type); + BOOST_ASSERT(NULL != this_type); const boost::serialization::extended_type_info * true_type = i.get_derived_extended_type_info(t); @@ -433,7 +433,7 @@ struct save_pointer_type { archive_serializer_map >::get_const_instance().find(*true_type) ); - assert(NULL != bpos); + BOOST_ASSERT(NULL != bpos); if(NULL == bpos) boost::serialization::throw_exception( archive_exception( diff --git a/include/boost/archive/impl/basic_binary_iarchive.ipp b/include/boost/archive/impl/basic_binary_iarchive.ipp index a9757b30..8ea39f70 100644 --- a/include/boost/archive/impl/basic_binary_iarchive.ipp +++ b/include/boost/archive/impl/basic_binary_iarchive.ipp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include -#include +#include #include #include diff --git a/include/boost/archive/impl/basic_binary_iprimitive.ipp b/include/boost/archive/impl/basic_binary_iprimitive.ipp index f6095713..e0f5c2ea 100644 --- a/include/boost/archive/impl/basic_binary_iprimitive.ipp +++ b/include/boost/archive/impl/basic_binary_iprimitive.ipp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // size_t, NULL #include // memcpy diff --git a/include/boost/archive/impl/basic_binary_oarchive.ipp b/include/boost/archive/impl/basic_binary_oarchive.ipp index cd12c4c6..dec2cd77 100644 --- a/include/boost/archive/impl/basic_binary_oarchive.ipp +++ b/include/boost/archive/impl/basic_binary_oarchive.ipp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include -#include +#include #include #include diff --git a/include/boost/archive/impl/basic_text_iprimitive.ipp b/include/boost/archive/impl/basic_text_iprimitive.ipp index 581dbfb3..ad6a6d58 100644 --- a/include/boost/archive/impl/basic_text_iprimitive.ipp +++ b/include/boost/archive/impl/basic_text_iprimitive.ipp @@ -63,7 +63,7 @@ basic_text_iprimitive::load_binary( if(0 == count) return; - assert( + BOOST_ASSERT( static_cast((std::numeric_limits::max)()) > (count + sizeof(CharType) - 1)/sizeof(CharType) ); diff --git a/include/boost/archive/impl/basic_text_oarchive.ipp b/include/boost/archive/impl/basic_text_oarchive.ipp index fb8d18e4..34e6995c 100644 --- a/include/boost/archive/impl/basic_text_oarchive.ipp +++ b/include/boost/archive/impl/basic_text_oarchive.ipp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include -#include +#include #include #include // for BOOST_DEDUCED_TYPENAME @@ -32,7 +32,7 @@ basic_text_oarchive::newtoken() { switch(delimiter){ default: - assert(false); + BOOST_ASSERT(false); break; case eol: this->This()->put('\n'); diff --git a/include/boost/archive/impl/basic_xml_iarchive.ipp b/include/boost/archive/impl/basic_xml_iarchive.ipp index 9528c4ad..52dfde1a 100644 --- a/include/boost/archive/impl/basic_xml_iarchive.ipp +++ b/include/boost/archive/impl/basic_xml_iarchive.ipp @@ -8,7 +8,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // NULL #include diff --git a/include/boost/archive/impl/xml_wiarchive_impl.ipp b/include/boost/archive/impl/xml_wiarchive_impl.ipp index 58498dbe..9dde66c8 100644 --- a/include/boost/archive/impl/xml_wiarchive_impl.ipp +++ b/include/boost/archive/impl/xml_wiarchive_impl.ipp @@ -20,7 +20,7 @@ namespace std{ #include // msvc 6.0 needs this to suppress warnings #ifndef BOOST_NO_STD_WSTREAMBUF -#include +#include #include #include // Dinkumware and RogueWave diff --git a/include/boost/archive/iterators/base64_exception.hpp b/include/boost/archive/iterators/base64_exception.hpp index eb2d2e1b..81ad28ed 100644 --- a/include/boost/archive/iterators/base64_exception.hpp +++ b/include/boost/archive/iterators/base64_exception.hpp @@ -20,7 +20,7 @@ #ifndef BOOST_NO_EXCEPTIONS #include -#include +#include namespace boost { namespace archive { @@ -53,7 +53,7 @@ public: msg = "attempt to decode a value not in base64 char set"; break; default: - assert(false); + BOOST_ASSERT(false); break; } return msg; diff --git a/include/boost/archive/iterators/base64_from_binary.hpp b/include/boost/archive/iterators/base64_from_binary.hpp index 4e6023a8..ecb916a0 100644 --- a/include/boost/archive/iterators/base64_from_binary.hpp +++ b/include/boost/archive/iterators/base64_from_binary.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // size_t #include // for BOOST_DEDUCED_TYPENAME @@ -49,7 +49,7 @@ struct from_6_bit { "abcdefghijklmnopqrstuvwxyz" "0123456789" "+/"; - assert(t < 64); + BOOST_ASSERT(t < 64); return lookup_table[static_cast(t)]; } }; diff --git a/include/boost/archive/iterators/binary_from_base64.hpp b/include/boost/archive/iterators/binary_from_base64.hpp index d14439f1..47e9d0b1 100644 --- a/include/boost/archive/iterators/binary_from_base64.hpp +++ b/include/boost/archive/iterators/binary_from_base64.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // for BOOST_DEDUCED_TYPENAME #include diff --git a/include/boost/archive/iterators/dataflow.hpp b/include/boost/archive/iterators/dataflow.hpp index 79584824..1623b67b 100644 --- a/include/boost/archive/iterators/dataflow.hpp +++ b/include/boost/archive/iterators/dataflow.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // for BOOST_DEDUCED_TYPENAME @@ -47,7 +47,7 @@ struct tri_state { } m_state; // convert to bool operator bool (){ - assert(is_indeterminant != m_state); + BOOST_ASSERT(is_indeterminant != m_state); return is_true == m_state ? true : false; } // assign from bool diff --git a/include/boost/archive/iterators/dataflow_exception.hpp b/include/boost/archive/iterators/dataflow_exception.hpp index 765661e4..1d655a1e 100644 --- a/include/boost/archive/iterators/dataflow_exception.hpp +++ b/include/boost/archive/iterators/dataflow_exception.hpp @@ -21,7 +21,7 @@ #include #endif //BOOST_NO_EXCEPTIONS -#include +#include namespace boost { namespace archive { @@ -66,7 +66,7 @@ public: msg = "invalid multbyte/wide char conversion"; break; default: - assert(false); + BOOST_ASSERT(false); break; } return msg; diff --git a/include/boost/archive/iterators/escape.hpp b/include/boost/archive/iterators/escape.hpp index b11d1a67..bb527d43 100644 --- a/include/boost/archive/iterators/escape.hpp +++ b/include/boost/archive/iterators/escape.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // NULL #include // for BOOST_DEDUCED_TYPENAME diff --git a/include/boost/archive/iterators/insert_linebreaks.hpp b/include/boost/archive/iterators/insert_linebreaks.hpp index 09b13e5b..5f826cac 100644 --- a/include/boost/archive/iterators/insert_linebreaks.hpp +++ b/include/boost/archive/iterators/insert_linebreaks.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // for BOOST_DEDUCED_TYPENAME #if defined(BOOST_NO_STDC_NAMESPACE) diff --git a/include/boost/archive/iterators/mb_from_wchar.hpp b/include/boost/archive/iterators/mb_from_wchar.hpp index 4b34c0fa..d8f8a129 100644 --- a/include/boost/archive/iterators/mb_from_wchar.hpp +++ b/include/boost/archive/iterators/mb_from_wchar.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // size_t #include // for wctomb() @@ -90,9 +90,9 @@ class mb_from_wchar #else m_bend = std::wctomb(m_buffer, value); #endif - assert(-1 != m_bend); - assert((std::size_t)m_bend <= sizeof(m_buffer)); - assert(m_bend > 0); + BOOST_ASSERT(-1 != m_bend); + BOOST_ASSERT((std::size_t)m_bend <= sizeof(m_buffer)); + BOOST_ASSERT(m_bend > 0); m_bnext = 0; } diff --git a/include/boost/archive/iterators/remove_whitespace.hpp b/include/boost/archive/iterators/remove_whitespace.hpp index 2ccc3730..a8e10929 100644 --- a/include/boost/archive/iterators/remove_whitespace.hpp +++ b/include/boost/archive/iterators/remove_whitespace.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // for BOOST_DEDUCED_TYPENAME diff --git a/include/boost/archive/iterators/unescape.hpp b/include/boost/archive/iterators/unescape.hpp index f437c388..9cbd3161 100644 --- a/include/boost/archive/iterators/unescape.hpp +++ b/include/boost/archive/iterators/unescape.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // for BOOST_DEDUCED_TYPENAME #include diff --git a/include/boost/archive/iterators/wchar_from_mb.hpp b/include/boost/archive/iterators/wchar_from_mb.hpp index 12e7d57e..4da81215 100644 --- a/include/boost/archive/iterators/wchar_from_mb.hpp +++ b/include/boost/archive/iterators/wchar_from_mb.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include #include // size_t #include // mblen diff --git a/include/boost/archive/iterators/xml_escape.hpp b/include/boost/archive/iterators/xml_escape.hpp index fd40c020..eadb96e8 100644 --- a/include/boost/archive/iterators/xml_escape.hpp +++ b/include/boost/archive/iterators/xml_escape.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // for BOOST_DEDUCED_TYPENAME #include diff --git a/include/boost/archive/iterators/xml_unescape.hpp b/include/boost/archive/iterators/xml_unescape.hpp index 375e7d29..3295adb3 100644 --- a/include/boost/archive/iterators/xml_unescape.hpp +++ b/include/boost/archive/iterators/xml_unescape.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // for BOOST_DEDUCED_TYPENAME diff --git a/include/boost/archive/iterators/xml_unescape_exception.hpp b/include/boost/archive/iterators/xml_unescape_exception.hpp index a1417373..259d2ba2 100644 --- a/include/boost/archive/iterators/xml_unescape_exception.hpp +++ b/include/boost/archive/iterators/xml_unescape_exception.hpp @@ -20,7 +20,7 @@ #ifndef BOOST_NO_EXCEPTIONS #include -#include +#include namespace boost { namespace archive { diff --git a/include/boost/archive/tmpdir.hpp b/include/boost/archive/tmpdir.hpp index f962e116..9e6ada4c 100644 --- a/include/boost/archive/tmpdir.hpp +++ b/include/boost/archive/tmpdir.hpp @@ -18,7 +18,7 @@ #include // getenv #include // NULL -//#include +//#include #include #ifdef BOOST_NO_STDC_NAMESPACE @@ -38,7 +38,7 @@ inline const char * tmpdir(){ if(NULL == dirname) dirname = std::getenv("TEMP"); if(NULL == dirname){ - //assert(false); // no temp directory found + //BOOST_ASSERT(false); // no temp directory found dirname = "."; } return dirname; diff --git a/include/boost/archive/xml_archive_exception.hpp b/include/boost/archive/xml_archive_exception.hpp index c8d65e01..48e6cb32 100644 --- a/include/boost/archive/xml_archive_exception.hpp +++ b/include/boost/archive/xml_archive_exception.hpp @@ -17,7 +17,7 @@ // See http://www.boost.org for updates, documentation, and revision history. #include -#include +#include #include #include diff --git a/include/boost/serialization/binary_object.hpp b/include/boost/serialization/binary_object.hpp index 0d8d027c..cbc19f46 100644 --- a/include/boost/serialization/binary_object.hpp +++ b/include/boost/serialization/binary_object.hpp @@ -16,7 +16,7 @@ // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include // std::size_t #include diff --git a/include/boost/serialization/collections_load_imp.hpp b/include/boost/serialization/collections_load_imp.hpp index 1ad80f60..11b00cdb 100644 --- a/include/boost/serialization/collections_load_imp.hpp +++ b/include/boost/serialization/collections_load_imp.hpp @@ -22,7 +22,7 @@ // helper function templates for serialization of collections -#include +#include #include // size_t #include // msvc 6.0 needs this for warning suppression #if defined(BOOST_NO_STDC_NAMESPACE) diff --git a/include/boost/serialization/extended_type_info.hpp b/include/boost/serialization/extended_type_info.hpp index f47109a3..b6540660 100644 --- a/include/boost/serialization/extended_type_info.hpp +++ b/include/boost/serialization/extended_type_info.hpp @@ -19,7 +19,7 @@ // for now, extended type info is part of the serialization libraries // this could change in the future. #include -#include +#include #include // NULL #include #include diff --git a/include/boost/serialization/extended_type_info_no_rtti.hpp b/include/boost/serialization/extended_type_info_no_rtti.hpp index fd19ad66..0f0b275a 100644 --- a/include/boost/serialization/extended_type_info_no_rtti.hpp +++ b/include/boost/serialization/extended_type_info_no_rtti.hpp @@ -17,7 +17,7 @@ // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org for updates, documentation, and revision history. -#include +#include #include #include @@ -115,7 +115,7 @@ public: // function. So if the is not a polymporphic type it's likely an error BOOST_STATIC_WARNING(boost::is_polymorphic< T >::value); const char * derived_key = t.get_key(); - assert(NULL != derived_key); + BOOST_ASSERT(NULL != derived_key); return boost::serialization::extended_type_info::find(derived_key); } const char * get_key() const{ @@ -140,7 +140,7 @@ public: case 4: return factory::type, 4>(ap); default: - assert(false); // too many arguments + BOOST_ASSERT(false); // too many arguments // throw exception here? return NULL; } diff --git a/include/boost/serialization/extended_type_info_typeid.hpp b/include/boost/serialization/extended_type_info_typeid.hpp index c8674d97..d60c369f 100644 --- a/include/boost/serialization/extended_type_info_typeid.hpp +++ b/include/boost/serialization/extended_type_info_typeid.hpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include @@ -124,7 +124,7 @@ public: case 4: return factory::type, 4>(ap); default: - assert(false); // too many arguments + BOOST_ASSERT(false); // too many arguments // throw exception here? return NULL; } diff --git a/include/boost/serialization/factory.hpp b/include/boost/serialization/factory.hpp index 9039a32c..73f66041 100644 --- a/include/boost/serialization/factory.hpp +++ b/include/boost/serialization/factory.hpp @@ -35,7 +35,7 @@ namespace serialization { // default implementation does nothing. template T * factory(std::va_list){ - assert(false); + BOOST_ASSERT(false); // throw exception here? return NULL; } diff --git a/include/boost/serialization/item_version_type.hpp b/include/boost/serialization/item_version_type.hpp index 838c33ac..f3e5adac 100644 --- a/include/boost/serialization/item_version_type.hpp +++ b/include/boost/serialization/item_version_type.hpp @@ -12,7 +12,7 @@ #include // fixes broken example build on x86_64-linux-gnu-gcc-4.6.0 -#include +#include namespace boost { namespace serialization { @@ -30,7 +30,7 @@ public: // should be private - but MPI fails if it's not!!! item_version_type(): t(0) {}; explicit item_version_type(const unsigned int t_) : t(t_){ - assert(t_ <= boost::integer_traits::const_max); + BOOST_ASSERT(t_ <= boost::integer_traits::const_max); } item_version_type(const item_version_type & t_) : t(t_.t) diff --git a/include/boost/serialization/singleton.hpp b/include/boost/serialization/singleton.hpp index d7f7265f..f521590e 100644 --- a/include/boost/serialization/singleton.hpp +++ b/include/boost/serialization/singleton.hpp @@ -34,7 +34,7 @@ # pragma once #endif -#include +#include #include #include #include @@ -128,13 +128,13 @@ private: static detail::singleton_wrapper< T > t; // refer to instance, causing it to be instantiated (and // initialized at startup on working compilers) - assert(! detail::singleton_wrapper< T >::m_is_destroyed); + BOOST_ASSERT(! detail::singleton_wrapper< T >::m_is_destroyed); use(instance); return static_cast(t); } public: BOOST_DLLEXPORT static T & get_mutable_instance(){ - assert(! is_locked()); + BOOST_ASSERT(! is_locked()); return get_instance(); } BOOST_DLLEXPORT static const T & get_const_instance(){ diff --git a/src/archive_exception.cpp b/src/archive_exception.cpp index 589915c3..50d326a7 100644 --- a/src/archive_exception.cpp +++ b/src/archive_exception.cpp @@ -13,7 +13,7 @@ #endif #include -#include +#include #include #define BOOST_ARCHIVE_SOURCE @@ -93,7 +93,7 @@ archive_exception::archive_exception( m_msg = "output stream error"; break; default: - assert(false); + BOOST_ASSERT(false); break; } } diff --git a/src/basic_iarchive.cpp b/src/basic_iarchive.cpp index 29a9a259..e9badddb 100644 --- a/src/basic_iarchive.cpp +++ b/src/basic_iarchive.cpp @@ -10,7 +10,7 @@ #include // msvc 6.0 needs this to suppress warnings -#include +#include #include #include #include @@ -300,7 +300,7 @@ basic_iarchive_impl::register_type( if(result.second){ cobject_id_vector.push_back(cobject_id(bis)); - assert(cobject_info_set.size() == cobject_id_vector.size()); + BOOST_ASSERT(cobject_info_set.size() == cobject_id_vector.size()); } cid = result.first->m_class_id; // borland complains without this minor hack @@ -433,11 +433,11 @@ basic_iarchive_impl::load_pointer( ); bpis_ptr = (*finder)(*eti); } - assert(NULL != bpis_ptr); + BOOST_ASSERT(NULL != bpis_ptr); class_id_type new_cid = register_type(bpis_ptr->get_basic_serializer()); int i = cid; cobject_id_vector[i].bpis_ptr = bpis_ptr; - assert(new_cid == cid); + BOOST_ASSERT(new_cid == cid); } int i = cid; cobject_id & co = cobject_id_vector[i]; @@ -484,7 +484,7 @@ basic_iarchive_impl::load_pointer( ); t = object_id_vector[ui].address; object_id_vector[ui].loaded_as_pointer = true; - assert(NULL != t); + BOOST_ASSERT(NULL != t); } return bpis_ptr; diff --git a/src/basic_oarchive.cpp b/src/basic_oarchive.cpp index f3473b9a..33f33f88 100644 --- a/src/basic_oarchive.cpp +++ b/src/basic_oarchive.cpp @@ -10,7 +10,7 @@ #include // msvc 6.0 needs this for warning suppression -#include +#include #include #include // NULL @@ -59,8 +59,8 @@ class basic_oarchive_impl { bool operator<(const aobject &rhs) const { - assert(NULL != address); - assert(NULL != rhs.address); + BOOST_ASSERT(NULL != address); + BOOST_ASSERT(NULL != rhs.address); if( address < rhs.address ) return true; if( address > rhs.address ) @@ -178,28 +178,28 @@ basic_oarchive_impl::find(const serialization::extended_type_info & ti) const { public basic_oserializer { bool class_info() const { - assert(false); + BOOST_ASSERT(false); return false; } // returns true if objects should be tracked bool tracking(const unsigned int) const { - assert(false); + BOOST_ASSERT(false); return false; } // returns class version version_type version() const { - assert(false); + BOOST_ASSERT(false); return version_type(0); } // returns true if this class is polymorphic bool is_polymorphic() const{ - assert(false); + BOOST_ASSERT(false); return false; } void save_object_data( basic_oarchive & /*ar*/, const void * /*x*/ ) const { - assert(false); + BOOST_ASSERT(false); } public: bosarg(const serialization::extended_type_info & eti) : diff --git a/src/basic_serializer_map.cpp b/src/basic_serializer_map.cpp index c6cfb733..80e805fa 100644 --- a/src/basic_serializer_map.cpp +++ b/src/basic_serializer_map.cpp @@ -99,7 +99,7 @@ basic_serializer_map::find( map_type::const_iterator it; it = m_map.find(& bs); if(it == m_map.end()){ - assert(false); + BOOST_ASSERT(false); return 0; } return *it; diff --git a/src/extended_type_info.cpp b/src/extended_type_info.cpp index bc28d6ad..2efbefc8 100644 --- a/src/extended_type_info.cpp +++ b/src/extended_type_info.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include // NULL #include // msvc needs this to suppress warning @@ -52,9 +52,9 @@ struct key_compare if(lhs == rhs) return false; const char * l = lhs->get_key(); - assert(NULL != l); + BOOST_ASSERT(NULL != l); const char * r = rhs->get_key(); - assert(NULL != r); + BOOST_ASSERT(NULL != r); // performance shortcut // shortcut to exploit string pooling if(l == r) @@ -77,23 +77,23 @@ class extended_type_info_arg : public extended_type_info { virtual bool is_less_than(const extended_type_info & /*rhs*/) const { - assert(false); + BOOST_ASSERT(false); return false; }; virtual bool is_equal(const extended_type_info & /*rhs*/) const { - assert(false); + BOOST_ASSERT(false); return false; }; virtual const char * get_debug_info() const { return get_key(); } virtual void * construct(unsigned int /*count*/, ...) const{ - assert(false); + BOOST_ASSERT(false); return NULL; } virtual void destroy(void const * const /*p*/) const { - assert(false); + BOOST_ASSERT(false); } public: extended_type_info_arg(const char * key) : @@ -137,7 +137,7 @@ extended_type_info::key_unregister() const{ BOOST_SERIALIZATION_DECL(const extended_type_info *) extended_type_info::find(const char *key) { - assert(NULL != key); + BOOST_ASSERT(NULL != key); const detail::ktmap & k = singleton::get_const_instance(); const detail::extended_type_info_arg eti_key(key); const detail::ktmap::const_iterator it = k.find(& eti_key); diff --git a/src/extended_type_info_no_rtti.cpp b/src/extended_type_info_no_rtti.cpp index cb4f14f9..3b2a8884 100644 --- a/src/extended_type_info_no_rtti.cpp +++ b/src/extended_type_info_no_rtti.cpp @@ -11,7 +11,7 @@ #include #include // NULL -#include +#include #include #if defined(BOOST_NO_STDC_NAMESPACE) @@ -52,8 +52,8 @@ extended_type_info_no_rtti_0::is_less_than( // through a pointer to the to most derived class. OR make sure // that the BOOST_CLASS_EXPORT is included in every file // which does this. - assert(NULL != l); - assert(NULL != r); + BOOST_ASSERT(NULL != l); + BOOST_ASSERT(NULL != r); return std::strcmp(l, r) < 0; } @@ -66,11 +66,11 @@ extended_type_info_no_rtti_0::is_equal( return true; // null keys don't match with anything const char * l = get_key(); - assert(NULL != l); + BOOST_ASSERT(NULL != l); if(NULL == l) return false; const char * r = rhs.get_key(); - assert(NULL != r); + BOOST_ASSERT(NULL != r); if(NULL == r) return false; return 0 == std::strcmp(l, r); diff --git a/src/extended_type_info_typeid.cpp b/src/extended_type_info_typeid.cpp index 6e62b40d..463287af 100644 --- a/src/extended_type_info_typeid.cpp +++ b/src/extended_type_info_typeid.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include // NULL @@ -96,7 +96,7 @@ extended_type_info_typeid_0::type_unregister() tkmap & x = singleton::get_mutable_instance(); tkmap::iterator start = x.lower_bound(this); tkmap::iterator end = x.upper_bound(this); - assert(start != end); + BOOST_ASSERT(start != end); // remove entry in map which corresponds to this type do{ @@ -120,11 +120,11 @@ class extended_type_info_typeid_arg : public extended_type_info_typeid_0 { virtual void * construct(unsigned int /*count*/, ...) const{ - assert(false); + BOOST_ASSERT(false); return NULL; } virtual void destroy(void const * const /*p*/) const { - assert(false); + BOOST_ASSERT(false); } public: extended_type_info_typeid_arg(const std::type_info & ti) : diff --git a/src/shared_ptr_helper.cpp b/src/shared_ptr_helper.cpp index 33c15b78..b155cd94 100644 --- a/src/shared_ptr_helper.cpp +++ b/src/shared_ptr_helper.cpp @@ -103,7 +103,7 @@ shared_ptr_helper::append(const boost::shared_ptr &sp){ if(i == m_pointers->end()){ std::pair result; result = m_pointers->insert(sp); - assert(result.second); + BOOST_ASSERT(result.second); } } diff --git a/src/void_cast.cpp b/src/void_cast.cpp index de841716..16cd4202 100644 --- a/src/void_cast.cpp +++ b/src/void_cast.cpp @@ -13,7 +13,7 @@ # pragma warning (disable : 4786) // too long name, harmless warning #endif -#include +#include #include // NULL #ifdef BOOST_SERIALIZATION_LOG #include @@ -23,7 +23,7 @@ #include #include #include -#include +#include // BOOST #define BOOST_SERIALIZATION_SOURCE @@ -185,16 +185,16 @@ class void_caster_argument : public void_caster { virtual void const * upcast(void const * const /*t*/) const { - assert(false); + BOOST_ASSERT(false); return NULL; } virtual void const * downcast( void const * const /*t*/) const { - assert(false); + BOOST_ASSERT(false); return NULL; } virtual bool has_virtual_base() const { - assert(false); + BOOST_ASSERT(false); return false; } public: diff --git a/src/xml_archive_exception.cpp b/src/xml_archive_exception.cpp index f011066e..ea78916a 100644 --- a/src/xml_archive_exception.cpp +++ b/src/xml_archive_exception.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include #define BOOST_ARCHIVE_SOURCE @@ -47,7 +47,7 @@ xml_archive_exception::xml_archive_exception( m_msg = "Invalid XML tag name"; break; default: - assert(false); + BOOST_ASSERT(false); break; } }