|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66514 - in trunk: boost/archive boost/archive/detail boost/archive/impl boost/archive/iterators boost/serialization libs/serialization/src
From: admin_at_[hidden]
Date: 2010-11-11 22:56:37
Author: wash
Date: 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
New Revision: 66514
URL: http://svn.boost.org/trac/boost/changeset/66514
Log:
assert -> BOOST_ASSERT
Text files modified:
trunk/boost/archive/archive_exception.hpp | 2 +-
trunk/boost/archive/basic_archive.hpp | 12 ++++++------
trunk/boost/archive/basic_binary_iprimitive.hpp | 8 ++++----
trunk/boost/archive/basic_binary_oarchive.hpp | 2 +-
trunk/boost/archive/basic_binary_oprimitive.hpp | 10 +++++-----
trunk/boost/archive/basic_text_iprimitive.hpp | 2 +-
trunk/boost/archive/basic_text_oarchive.hpp | 2 +-
trunk/boost/archive/basic_text_oprimitive.hpp | 4 ++--
trunk/boost/archive/detail/basic_serializer.hpp | 4 ++--
trunk/boost/archive/detail/oserializer.hpp | 8 ++++----
trunk/boost/archive/impl/basic_binary_iarchive.ipp | 2 +-
trunk/boost/archive/impl/basic_binary_iprimitive.ipp | 2 +-
trunk/boost/archive/impl/basic_binary_oarchive.ipp | 2 +-
trunk/boost/archive/impl/basic_text_iprimitive.ipp | 2 +-
trunk/boost/archive/impl/basic_text_oarchive.ipp | 4 ++--
trunk/boost/archive/impl/basic_xml_iarchive.ipp | 2 +-
trunk/boost/archive/impl/xml_wiarchive_impl.ipp | 2 +-
trunk/boost/archive/iterators/base64_exception.hpp | 4 ++--
trunk/boost/archive/iterators/base64_from_binary.hpp | 4 ++--
trunk/boost/archive/iterators/binary_from_base64.hpp | 2 +-
trunk/boost/archive/iterators/dataflow.hpp | 4 ++--
trunk/boost/archive/iterators/dataflow_exception.hpp | 4 ++--
trunk/boost/archive/iterators/escape.hpp | 2 +-
trunk/boost/archive/iterators/insert_linebreaks.hpp | 2 +-
trunk/boost/archive/iterators/mb_from_wchar.hpp | 8 ++++----
trunk/boost/archive/iterators/remove_whitespace.hpp | 2 +-
trunk/boost/archive/iterators/unescape.hpp | 2 +-
trunk/boost/archive/iterators/wchar_from_mb.hpp | 2 +-
trunk/boost/archive/iterators/xml_escape.hpp | 2 +-
trunk/boost/archive/iterators/xml_unescape.hpp | 2 +-
trunk/boost/archive/iterators/xml_unescape_exception.hpp | 2 +-
trunk/boost/archive/tmpdir.hpp | 4 ++--
trunk/boost/archive/xml_archive_exception.hpp | 2 +-
trunk/boost/serialization/binary_object.hpp | 2 +-
trunk/boost/serialization/collections_load_imp.hpp | 2 +-
trunk/boost/serialization/extended_type_info.hpp | 2 +-
trunk/boost/serialization/extended_type_info_no_rtti.hpp | 6 +++---
trunk/boost/serialization/extended_type_info_typeid.hpp | 4 ++--
trunk/boost/serialization/factory.hpp | 2 +-
trunk/boost/serialization/item_version_type.hpp | 4 ++--
trunk/boost/serialization/singleton.hpp | 6 +++---
trunk/libs/serialization/src/archive_exception.cpp | 4 ++--
trunk/libs/serialization/src/basic_iarchive.cpp | 10 +++++-----
trunk/libs/serialization/src/basic_oarchive.cpp | 16 ++++++++--------
trunk/libs/serialization/src/basic_serializer_map.cpp | 2 +-
trunk/libs/serialization/src/extended_type_info.cpp | 16 ++++++++--------
trunk/libs/serialization/src/extended_type_info_no_rtti.cpp | 10 +++++-----
trunk/libs/serialization/src/extended_type_info_typeid.cpp | 8 ++++----
trunk/libs/serialization/src/shared_ptr_helper.cpp | 2 +-
trunk/libs/serialization/src/void_cast.cpp | 10 +++++-----
trunk/libs/serialization/src/xml_archive_exception.cpp | 4 ++--
51 files changed, 114 insertions(+), 114 deletions(-)
Modified: trunk/boost/archive/archive_exception.hpp
==============================================================================
--- trunk/boost/archive/archive_exception.hpp (original)
+++ trunk/boost/archive/archive_exception.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -17,7 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <exception>
-#include <cassert>
+#include <boost/assert.hpp>
#include <string>
#include <boost/config.hpp>
Modified: trunk/boost/archive/basic_archive.hpp
==============================================================================
--- trunk/boost/archive/basic_archive.hpp (original)
+++ trunk/boost/archive/basic_archive.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <boost/cstdint.hpp> // size_t
#include <boost/noncopyable.hpp>
@@ -44,7 +44,7 @@
public:
library_version_type(): t(0) {};
explicit library_version_type(const unsigned int & t_) : t(t_){
- assert(t_ <= boost::integer_traits<base_type>::const_max);
+ BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
}
library_version_type(const library_version_type & t_) :
t(t_.t)
@@ -80,7 +80,7 @@
// 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<base_type>::const_max);
+ BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
}
version_type(const version_type & t_) :
t(t_.t)
@@ -113,10 +113,10 @@
// 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<base_type>::const_max);
+ BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
}
explicit class_id_type(const std::size_t t_) : t(t_){
- // assert(t_ <= boost::integer_traits<base_type>::const_max);
+ // BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
}
class_id_type(const class_id_type & t_) :
t(t_.t)
@@ -151,7 +151,7 @@
public:
object_id_type(): t(0) {};
explicit object_id_type(const unsigned int & t_) : t(t_){
- assert(t_ <= boost::integer_traits<base_type>::const_max);
+ BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
}
object_id_type(const object_id_type & t_) :
t(t_.t)
Modified: trunk/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_iprimitive.hpp (original)
+++ trunk/boost/archive/basic_binary_iprimitive.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -28,7 +28,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <iosfwd>
-#include <cassert>
+#include <boost/assert.hpp>
#include <locale>
#include <cstring> // std::memcpy
#include <cstddef> // std::size_t
@@ -95,7 +95,7 @@
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 @@
std::size_t count
){
// note: an optimizer should eliminate the following for char files
- assert(
+ BOOST_ASSERT(
static_cast<std::streamsize>(count / sizeof(Elem))
<= boost::integer_traits<std::streamsize>::const_max
);
@@ -165,7 +165,7 @@
archive_exception(archive_exception::input_stream_error)
);
// note: an optimizer should eliminate the following for char files
- assert(count % sizeof(Elem) <= boost::integer_traits<std::streamsize>::const_max);
+ BOOST_ASSERT(count % sizeof(Elem) <= boost::integer_traits<std::streamsize>::const_max);
s = static_cast<std::streamsize>(count % sizeof(Elem));
if(0 < s){
// if(is.fail())
Modified: trunk/boost/archive/basic_binary_oarchive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_oarchive.hpp (original)
+++ trunk/boost/archive/basic_binary_oarchive.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -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 <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/serialization/pfto.hpp>
Modified: trunk/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_oprimitive.hpp (original)
+++ trunk/boost/archive/basic_binary_oprimitive.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -24,7 +24,7 @@
// ON PLATFORM APART FROM THE ONE THEY ARE CREATE ON
#include <iosfwd>
-#include <cassert>
+#include <boost/assert.hpp>
#include <locale>
#include <streambuf> // basic_streambuf
#include <string>
@@ -88,7 +88,7 @@
// trap usage of invalid uninitialized boolean which would
// otherwise crash on load.
void save(const bool t){
- assert(0 == static_cast<int>(t) || 1 == static_cast<int>(t));
+ BOOST_ASSERT(0 == static_cast<int>(t) || 1 == static_cast<int>(t));
save_binary(& t, sizeof(t));
}
BOOST_ARCHIVE_OR_WARCHIVE_DECL(void)
@@ -146,7 +146,7 @@
const void *address,
std::size_t count
){
- //assert(
+ //BOOST_ASSERT(
// static_cast<std::size_t>((std::numeric_limits<std::streamsize>::max)()) >= count
//);
// note: if the following assertions fail
@@ -160,7 +160,7 @@
// figure number of elements to output - round up
count = ( count + sizeof(Elem) - 1)
/ sizeof(Elem);
- assert(count <= std::size_t(boost::integer_traits<std::streamsize>::const_max));
+ BOOST_ASSERT(count <= std::size_t(boost::integer_traits<std::streamsize>::const_max));
std::streamsize scount = m_sb.sputn(
static_cast<const Elem *>(address),
static_cast<std::streamsize>(count)
@@ -173,7 +173,7 @@
// static_cast<const BOOST_DEDUCED_TYPENAME OStream::char_type *>(address),
// count
//);
- //assert(os.good());
+ //BOOST_ASSERT(os.good());
}
} //namespace boost
Modified: trunk/boost/archive/basic_text_iprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_text_iprimitive.hpp (original)
+++ trunk/boost/archive/basic_text_iprimitive.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -24,7 +24,7 @@
// in such cases. So we can't use basic_ostream<IStream::char_type> but rather
// use two template parameters
-#include <cassert>
+#include <boost/assert.hpp>
#include <locale>
#include <cstddef> // size_t
Modified: trunk/boost/archive/basic_text_oarchive.hpp
==============================================================================
--- trunk/boost/archive/basic_text_oarchive.hpp (original)
+++ trunk/boost/archive/basic_text_oarchive.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -24,7 +24,7 @@
// in such cases. So we can't use basic_ostream<OStream::char_type> but rather
// use two template parameters
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <boost/serialization/pfto.hpp>
#include <boost/detail/workaround.hpp>
Modified: trunk/boost/archive/basic_text_oprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_text_oprimitive.hpp (original)
+++ trunk/boost/archive/basic_text_oprimitive.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -27,7 +27,7 @@
#include <iomanip>
#include <locale>
#include <boost/config/no_tr1/cmath.hpp> // isnan
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // size_t
#include <boost/config.hpp>
@@ -97,7 +97,7 @@
void save(const bool t){
// trap usage of invalid uninitialized boolean which would
// otherwise crash on load.
- assert(0 == static_cast<int>(t) || 1 == static_cast<int>(t));
+ BOOST_ASSERT(0 == static_cast<int>(t) || 1 == static_cast<int>(t));
if(os.fail())
boost::serialization::throw_exception(
archive_exception(archive_exception::output_stream_error)
Modified: trunk/boost/archive/detail/basic_serializer.hpp
==============================================================================
--- trunk/boost/archive/detail/basic_serializer.hpp (original)
+++ trunk/boost/archive/detail/basic_serializer.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // NULL
#include <boost/noncopyable.hpp>
@@ -42,7 +42,7 @@
) :
m_eti(& eti)
{
- assert(NULL != & eti);
+ BOOST_ASSERT(NULL != & eti);
}
public:
inline bool
Modified: trunk/boost/archive/detail/oserializer.hpp
==============================================================================
--- trunk/boost/archive/detail/oserializer.hpp (original)
+++ trunk/boost/archive/detail/oserializer.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -22,7 +22,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // NULL
#include <boost/config.hpp>
@@ -186,7 +186,7 @@
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<T *>(const_cast<void *>(x));
@@ -384,7 +384,7 @@
// 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 @@
archive_serializer_map<Archive>
>::get_const_instance().find(*true_type)
);
- assert(NULL != bpos);
+ BOOST_ASSERT(NULL != bpos);
if(NULL == bpos)
boost::serialization::throw_exception(
archive_exception(
Modified: trunk/boost/archive/impl/basic_binary_iarchive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_binary_iarchive.ipp (original)
+++ trunk/boost/archive/impl/basic_binary_iarchive.ipp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -8,7 +8,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <string>
-#include <cassert>
+#include <boost/assert.hpp>
#include <algorithm>
#include <cstring>
Modified: trunk/boost/archive/impl/basic_binary_iprimitive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_binary_iprimitive.ipp (original)
+++ trunk/boost/archive/impl/basic_binary_iprimitive.ipp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -8,7 +8,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // size_t, NULL
#include <cstring> // memcpy
Modified: trunk/boost/archive/impl/basic_binary_oarchive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_binary_oarchive.ipp (original)
+++ trunk/boost/archive/impl/basic_binary_oarchive.ipp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -8,7 +8,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <string>
-#include <cassert>
+#include <boost/assert.hpp>
#include <algorithm>
#include <cstring>
Modified: trunk/boost/archive/impl/basic_text_iprimitive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_text_iprimitive.ipp (original)
+++ trunk/boost/archive/impl/basic_text_iprimitive.ipp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -63,7 +63,7 @@
if(0 == count)
return;
- assert(
+ BOOST_ASSERT(
static_cast<std::size_t>((std::numeric_limits<std::streamsize>::max)())
> (count + sizeof(CharType) - 1)/sizeof(CharType)
);
Modified: trunk/boost/archive/impl/basic_text_oarchive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_text_oarchive.ipp (original)
+++ trunk/boost/archive/impl/basic_text_oarchive.ipp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -8,7 +8,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <string>
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstring>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
@@ -32,7 +32,7 @@
{
switch(delimiter){
default:
- assert(false);
+ BOOST_ASSERT(false);
break;
case eol:
this->This()->put('\n');
Modified: trunk/boost/archive/impl/basic_xml_iarchive.ipp
==============================================================================
--- trunk/boost/archive/impl/basic_xml_iarchive.ipp (original)
+++ trunk/boost/archive/impl/basic_xml_iarchive.ipp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -8,7 +8,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // NULL
#include <algorithm>
Modified: trunk/boost/archive/impl/xml_wiarchive_impl.ipp
==============================================================================
--- trunk/boost/archive/impl/xml_wiarchive_impl.ipp (original)
+++ trunk/boost/archive/impl/xml_wiarchive_impl.ipp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -20,7 +20,7 @@
#include <boost/config.hpp> // msvc 6.0 needs this to suppress warnings
#ifndef BOOST_NO_STD_WSTREAMBUF
-#include <cassert>
+#include <boost/assert.hpp>
#include <algorithm>
#include <boost/detail/workaround.hpp> // Dinkumware and RogueWave
Modified: trunk/boost/archive/iterators/base64_exception.hpp
==============================================================================
--- trunk/boost/archive/iterators/base64_exception.hpp (original)
+++ trunk/boost/archive/iterators/base64_exception.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -20,7 +20,7 @@
#ifndef BOOST_NO_EXCEPTIONS
#include <exception>
-#include <cassert>
+#include <boost/assert.hpp>
namespace boost {
namespace archive {
@@ -53,7 +53,7 @@
msg = "attempt to decode a value not in base64 char set";
break;
default:
- assert(false);
+ BOOST_ASSERT(false);
break;
}
return msg;
Modified: trunk/boost/archive/iterators/base64_from_binary.hpp
==============================================================================
--- trunk/boost/archive/iterators/base64_from_binary.hpp (original)
+++ trunk/boost/archive/iterators/base64_from_binary.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // size_t
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
@@ -49,7 +49,7 @@
"abcdefghijklmnopqrstuvwxyz"
"0123456789"
"+/";
- assert(t < 64);
+ BOOST_ASSERT(t < 64);
return lookup_table[static_cast<size_t>(t)];
}
};
Modified: trunk/boost/archive/iterators/binary_from_base64.hpp
==============================================================================
--- trunk/boost/archive/iterators/binary_from_base64.hpp (original)
+++ trunk/boost/archive/iterators/binary_from_base64.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
#include <boost/serialization/throw_exception.hpp>
Modified: trunk/boost/archive/iterators/dataflow.hpp
==============================================================================
--- trunk/boost/archive/iterators/dataflow.hpp (original)
+++ trunk/boost/archive/iterators/dataflow.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
@@ -47,7 +47,7 @@
} 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
Modified: trunk/boost/archive/iterators/dataflow_exception.hpp
==============================================================================
--- trunk/boost/archive/iterators/dataflow_exception.hpp (original)
+++ trunk/boost/archive/iterators/dataflow_exception.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -21,7 +21,7 @@
#include <exception>
#endif //BOOST_NO_EXCEPTIONS
-#include <cassert>
+#include <boost/assert.hpp>
namespace boost {
namespace archive {
@@ -66,7 +66,7 @@
msg = "invalid multbyte/wide char conversion";
break;
default:
- assert(false);
+ BOOST_ASSERT(false);
break;
}
return msg;
Modified: trunk/boost/archive/iterators/escape.hpp
==============================================================================
--- trunk/boost/archive/iterators/escape.hpp (original)
+++ trunk/boost/archive/iterators/escape.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // NULL
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
Modified: trunk/boost/archive/iterators/insert_linebreaks.hpp
==============================================================================
--- trunk/boost/archive/iterators/insert_linebreaks.hpp (original)
+++ trunk/boost/archive/iterators/insert_linebreaks.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
#if defined(BOOST_NO_STDC_NAMESPACE)
Modified: trunk/boost/archive/iterators/mb_from_wchar.hpp
==============================================================================
--- trunk/boost/archive/iterators/mb_from_wchar.hpp (original)
+++ trunk/boost/archive/iterators/mb_from_wchar.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // size_t
#include <cstdlib> // for wctomb()
@@ -90,9 +90,9 @@
#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;
}
Modified: trunk/boost/archive/iterators/remove_whitespace.hpp
==============================================================================
--- trunk/boost/archive/iterators/remove_whitespace.hpp (original)
+++ trunk/boost/archive/iterators/remove_whitespace.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
Modified: trunk/boost/archive/iterators/unescape.hpp
==============================================================================
--- trunk/boost/archive/iterators/unescape.hpp (original)
+++ trunk/boost/archive/iterators/unescape.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
#include <boost/iterator/iterator_adaptor.hpp>
Modified: trunk/boost/archive/iterators/wchar_from_mb.hpp
==============================================================================
--- trunk/boost/archive/iterators/wchar_from_mb.hpp (original)
+++ trunk/boost/archive/iterators/wchar_from_mb.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cctype>
#include <cstddef> // size_t
#include <cstdlib> // mblen
Modified: trunk/boost/archive/iterators/xml_escape.hpp
==============================================================================
--- trunk/boost/archive/iterators/xml_escape.hpp (original)
+++ trunk/boost/archive/iterators/xml_escape.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
#include <boost/serialization/pfto.hpp>
Modified: trunk/boost/archive/iterators/xml_unescape.hpp
==============================================================================
--- trunk/boost/archive/iterators/xml_unescape.hpp (original)
+++ trunk/boost/archive/iterators/xml_unescape.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp> // for BOOST_DEDUCED_TYPENAME
Modified: trunk/boost/archive/iterators/xml_unescape_exception.hpp
==============================================================================
--- trunk/boost/archive/iterators/xml_unescape_exception.hpp (original)
+++ trunk/boost/archive/iterators/xml_unescape_exception.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -20,7 +20,7 @@
#ifndef BOOST_NO_EXCEPTIONS
#include <exception>
-#include <cassert>
+#include <boost/assert.hpp>
namespace boost {
namespace archive {
Modified: trunk/boost/archive/tmpdir.hpp
==============================================================================
--- trunk/boost/archive/tmpdir.hpp (original)
+++ trunk/boost/archive/tmpdir.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -18,7 +18,7 @@
#include <cstdlib> // getenv
#include <cstddef> // NULL
-//#include <cassert>
+//#include <boost/assert.hpp>
#include <boost/config.hpp>
#ifdef BOOST_NO_STDC_NAMESPACE
@@ -38,7 +38,7 @@
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;
Modified: trunk/boost/archive/xml_archive_exception.hpp
==============================================================================
--- trunk/boost/archive/xml_archive_exception.hpp (original)
+++ trunk/boost/archive/xml_archive_exception.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -17,7 +17,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
#include <exception>
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <boost/preprocessor/empty.hpp>
Modified: trunk/boost/serialization/binary_object.hpp
==============================================================================
--- trunk/boost/serialization/binary_object.hpp (original)
+++ trunk/boost/serialization/binary_object.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -16,7 +16,7 @@
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // std::size_t
#include <boost/config.hpp>
Modified: trunk/boost/serialization/collections_load_imp.hpp
==============================================================================
--- trunk/boost/serialization/collections_load_imp.hpp (original)
+++ trunk/boost/serialization/collections_load_imp.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -22,7 +22,7 @@
// helper function templates for serialization of collections
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // size_t
#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
#if defined(BOOST_NO_STDC_NAMESPACE)
Modified: trunk/boost/serialization/extended_type_info.hpp
==============================================================================
--- trunk/boost/serialization/extended_type_info.hpp (original)
+++ trunk/boost/serialization/extended_type_info.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -19,7 +19,7 @@
// for now, extended type info is part of the serialization libraries
// this could change in the future.
#include <cstdarg>
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // NULL
#include <boost/config.hpp>
#include <boost/noncopyable.hpp>
Modified: trunk/boost/serialization/extended_type_info_no_rtti.hpp
==============================================================================
--- trunk/boost/serialization/extended_type_info_no_rtti.hpp (original)
+++ trunk/boost/serialization/extended_type_info_no_rtti.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -17,7 +17,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
// See http://www.boost.org for updates, documentation, and revision history.
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <boost/static_assert.hpp>
@@ -115,7 +115,7 @@
// 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 @@
case 4:
return factory<BOOST_DEDUCED_TYPENAME boost::remove_const< T >::type, 4>(ap);
default:
- assert(false); // too many arguments
+ BOOST_ASSERT(false); // too many arguments
// throw exception here?
return NULL;
}
Modified: trunk/boost/serialization/extended_type_info_typeid.hpp
==============================================================================
--- trunk/boost/serialization/extended_type_info_typeid.hpp (original)
+++ trunk/boost/serialization/extended_type_info_typeid.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -20,7 +20,7 @@
#include <typeinfo>
#include <cstdarg>
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <boost/static_assert.hpp>
@@ -124,7 +124,7 @@
case 4:
return factory<BOOST_DEDUCED_TYPENAME boost::remove_const< T >::type, 4>(ap);
default:
- assert(false); // too many arguments
+ BOOST_ASSERT(false); // too many arguments
// throw exception here?
return NULL;
}
Modified: trunk/boost/serialization/factory.hpp
==============================================================================
--- trunk/boost/serialization/factory.hpp (original)
+++ trunk/boost/serialization/factory.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -35,7 +35,7 @@
// default implementation does nothing.
template<class T, int N>
T * factory(std::va_list){
- assert(false);
+ BOOST_ASSERT(false);
// throw exception here?
return NULL;
}
Modified: trunk/boost/serialization/item_version_type.hpp
==============================================================================
--- trunk/boost/serialization/item_version_type.hpp (original)
+++ trunk/boost/serialization/item_version_type.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -12,7 +12,7 @@
#include <boost/serialization/is_bitwise_serializable.hpp>
// fixes broken example build on x86_64-linux-gnu-gcc-4.6.0
-#include <cassert>
+#include <boost/assert.hpp>
namespace boost {
namespace serialization {
@@ -30,7 +30,7 @@
// 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<base_type>::const_max);
+ BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
}
item_version_type(const item_version_type & t_) :
t(t_.t)
Modified: trunk/boost/serialization/singleton.hpp
==============================================================================
--- trunk/boost/serialization/singleton.hpp (original)
+++ trunk/boost/serialization/singleton.hpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -34,7 +34,7 @@
# pragma once
#endif
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#include <boost/noncopyable.hpp>
#include <boost/serialization/force_include.hpp>
@@ -128,13 +128,13 @@
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 &>(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(){
Modified: trunk/libs/serialization/src/archive_exception.cpp
==============================================================================
--- trunk/libs/serialization/src/archive_exception.cpp (original)
+++ trunk/libs/serialization/src/archive_exception.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -13,7 +13,7 @@
#endif
#include <exception>
-#include <cassert>
+#include <boost/assert.hpp>
#include <string>
#define BOOST_ARCHIVE_SOURCE
@@ -93,7 +93,7 @@
m_msg = "output stream error";
break;
default:
- assert(false);
+ BOOST_ASSERT(false);
break;
}
}
Modified: trunk/libs/serialization/src/basic_iarchive.cpp
==============================================================================
--- trunk/libs/serialization/src/basic_iarchive.cpp (original)
+++ trunk/libs/serialization/src/basic_iarchive.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -10,7 +10,7 @@
#include <boost/config.hpp> // msvc 6.0 needs this to suppress warnings
-#include <cassert>
+#include <boost/assert.hpp>
#include <set>
#include <list>
#include <vector>
@@ -300,7 +300,7 @@
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 @@
);
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 @@
);
t = object_id_vector[ui].address;
object_id_vector[ui].loaded_as_pointer = true;
- assert(NULL != t);
+ BOOST_ASSERT(NULL != t);
}
return bpis_ptr;
Modified: trunk/libs/serialization/src/basic_oarchive.cpp
==============================================================================
--- trunk/libs/serialization/src/basic_oarchive.cpp (original)
+++ trunk/libs/serialization/src/basic_oarchive.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -10,7 +10,7 @@
#include <boost/config.hpp> // msvc 6.0 needs this for warning suppression
-#include <cassert>
+#include <boost/assert.hpp>
#include <set>
#include <cstddef> // NULL
@@ -59,8 +59,8 @@
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 @@
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) :
Modified: trunk/libs/serialization/src/basic_serializer_map.cpp
==============================================================================
--- trunk/libs/serialization/src/basic_serializer_map.cpp (original)
+++ trunk/libs/serialization/src/basic_serializer_map.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -99,7 +99,7 @@
map_type::const_iterator it;
it = m_map.find(& bs);
if(it == m_map.end()){
- assert(false);
+ BOOST_ASSERT(false);
return 0;
}
return *it;
Modified: trunk/libs/serialization/src/extended_type_info.cpp
==============================================================================
--- trunk/libs/serialization/src/extended_type_info.cpp (original)
+++ trunk/libs/serialization/src/extended_type_info.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -15,7 +15,7 @@
#include <algorithm>
#include <set>
#include <utility>
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // NULL
#include <boost/config.hpp> // msvc needs this to suppress warning
@@ -52,9 +52,9 @@
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 @@
{
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 @@
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<detail::ktmap>::get_const_instance();
const detail::extended_type_info_arg eti_key(key);
const detail::ktmap::const_iterator it = k.find(& eti_key);
Modified: trunk/libs/serialization/src/extended_type_info_no_rtti.cpp
==============================================================================
--- trunk/libs/serialization/src/extended_type_info_no_rtti.cpp (original)
+++ trunk/libs/serialization/src/extended_type_info_no_rtti.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -11,7 +11,7 @@
#include <cstring>
#include <cstddef> // NULL
-#include <cassert>
+#include <boost/assert.hpp>
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
@@ -52,8 +52,8 @@
// 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 @@
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);
Modified: trunk/libs/serialization/src/extended_type_info_typeid.cpp
==============================================================================
--- trunk/libs/serialization/src/extended_type_info_typeid.cpp (original)
+++ trunk/libs/serialization/src/extended_type_info_typeid.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -11,7 +11,7 @@
#include <algorithm>
#include <set>
-#include <cassert>
+#include <boost/assert.hpp>
#include <typeinfo>
#include <cstddef> // NULL
@@ -96,7 +96,7 @@
tkmap & x = singleton<tkmap>::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 @@
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) :
Modified: trunk/libs/serialization/src/shared_ptr_helper.cpp
==============================================================================
--- trunk/libs/serialization/src/shared_ptr_helper.cpp (original)
+++ trunk/libs/serialization/src/shared_ptr_helper.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -103,7 +103,7 @@
if(i == m_pointers->end()){
std::pair<collection_type::iterator, bool> result;
result = m_pointers->insert(sp);
- assert(result.second);
+ BOOST_ASSERT(result.second);
}
}
Modified: trunk/libs/serialization/src/void_cast.cpp
==============================================================================
--- trunk/libs/serialization/src/void_cast.cpp (original)
+++ trunk/libs/serialization/src/void_cast.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -13,7 +13,7 @@
# pragma warning (disable : 4786) // too long name, harmless warning
#endif
-#include <cassert>
+#include <boost/assert.hpp>
#include <cstddef> // NULL
#ifdef BOOST_SERIALIZATION_LOG
#include <iostream>
@@ -23,7 +23,7 @@
#include <set>
#include <functional>
#include <algorithm>
-#include <cassert>
+#include <boost/assert.hpp>
// BOOST
#define BOOST_SERIALIZATION_SOURCE
@@ -185,16 +185,16 @@
{
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:
Modified: trunk/libs/serialization/src/xml_archive_exception.cpp
==============================================================================
--- trunk/libs/serialization/src/xml_archive_exception.cpp (original)
+++ trunk/libs/serialization/src/xml_archive_exception.cpp 2010-11-11 22:56:29 EST (Thu, 11 Nov 2010)
@@ -14,7 +14,7 @@
#include <exception>
-#include <cassert>
+#include <boost/assert.hpp>
#include <string>
#define BOOST_ARCHIVE_SOURCE
@@ -47,7 +47,7 @@
m_msg = "Invalid XML tag name";
break;
default:
- assert(false);
+ BOOST_ASSERT(false);
break;
}
}
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk