|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r68300 - in branches/release/boost/archive: . detail impl iterators
From: ramey_at_[hidden]
Date: 2011-01-19 12:33:58
Author: ramey
Date: 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
New Revision: 68300
URL: http://svn.boost.org/trac/boost/changeset/68300
Log:
Merge to 1.46 release
Properties modified:
branches/release/boost/archive/ (props changed)
Text files modified:
branches/release/boost/archive/archive_exception.hpp | 2 +-
branches/release/boost/archive/basic_archive.hpp | 14 +++++++-------
branches/release/boost/archive/basic_binary_iarchive.hpp | 23 +++++++++++++++++++++--
branches/release/boost/archive/basic_binary_iprimitive.hpp | 8 ++++----
branches/release/boost/archive/basic_binary_oarchive.hpp | 2 +-
branches/release/boost/archive/basic_binary_oprimitive.hpp | 10 +++++-----
branches/release/boost/archive/basic_text_iprimitive.hpp | 2 +-
branches/release/boost/archive/basic_text_oarchive.hpp | 2 +-
branches/release/boost/archive/basic_text_oprimitive.hpp | 4 ++--
branches/release/boost/archive/detail/basic_serializer.hpp | 4 ++--
branches/release/boost/archive/detail/oserializer.hpp | 10 +++++-----
branches/release/boost/archive/impl/basic_binary_iarchive.ipp | 2 +-
branches/release/boost/archive/impl/basic_binary_iprimitive.ipp | 2 +-
branches/release/boost/archive/impl/basic_binary_oarchive.ipp | 2 +-
branches/release/boost/archive/impl/basic_text_iprimitive.ipp | 2 +-
branches/release/boost/archive/impl/basic_text_oarchive.ipp | 4 ++--
branches/release/boost/archive/impl/basic_xml_iarchive.ipp | 2 +-
branches/release/boost/archive/impl/xml_wiarchive_impl.ipp | 2 +-
branches/release/boost/archive/iterators/base64_exception.hpp | 4 ++--
branches/release/boost/archive/iterators/base64_from_binary.hpp | 4 ++--
branches/release/boost/archive/iterators/binary_from_base64.hpp | 2 +-
branches/release/boost/archive/iterators/dataflow.hpp | 4 ++--
branches/release/boost/archive/iterators/dataflow_exception.hpp | 4 ++--
branches/release/boost/archive/iterators/escape.hpp | 2 +-
branches/release/boost/archive/iterators/insert_linebreaks.hpp | 2 +-
branches/release/boost/archive/iterators/mb_from_wchar.hpp | 8 ++++----
branches/release/boost/archive/iterators/remove_whitespace.hpp | 2 +-
branches/release/boost/archive/iterators/unescape.hpp | 2 +-
branches/release/boost/archive/iterators/wchar_from_mb.hpp | 2 +-
branches/release/boost/archive/iterators/xml_escape.hpp | 2 +-
branches/release/boost/archive/iterators/xml_unescape.hpp | 2 +-
branches/release/boost/archive/iterators/xml_unescape_exception.hpp | 2 +-
branches/release/boost/archive/text_iarchive.hpp | 3 ++-
branches/release/boost/archive/text_oarchive.hpp | 3 ++-
branches/release/boost/archive/tmpdir.hpp | 4 ++--
branches/release/boost/archive/xml_archive_exception.hpp | 2 +-
36 files changed, 86 insertions(+), 65 deletions(-)
Modified: branches/release/boost/archive/archive_exception.hpp
==============================================================================
--- branches/release/boost/archive/archive_exception.hpp (original)
+++ branches/release/boost/archive/archive_exception.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/basic_archive.hpp
==============================================================================
--- branches/release/boost/archive/basic_archive.hpp (original)
+++ branches/release/boost/archive/basic_archive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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)
@@ -254,7 +254,7 @@
#define BOOST_ARCHIVE_STRONG_TYPEDEF(T, D) \
class D : public T { \
public: \
- explicit D(const T t) : T(t){} \
+ explicit D(const T tt) : T(tt){} \
}; \
/**/
Modified: branches/release/boost/archive/basic_binary_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iarchive.hpp (original)
+++ branches/release/boost/archive/basic_binary_iarchive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -72,7 +72,6 @@
// include these to trap a change in binary format which
// isn't specifically handled
- BOOST_STATIC_ASSERT(sizeof(tracking_type) == sizeof(bool));
// upto 32K classes
BOOST_STATIC_ASSERT(sizeof(class_id_type) == sizeof(int_least16_t));
BOOST_STATIC_ASSERT(sizeof(class_id_reference_type) == sizeof(int_least16_t));
@@ -83,6 +82,19 @@
// binary files don't include the optional information
void load_override(class_id_optional_type & /* t */, int){}
+ void load_override(tracking_type & t, int /*version*/){
+ library_version_type lvt = this->get_library_version();
+ if(boost::archive::library_version_type(6) < lvt){
+ int_least8_t x=0;
+ * this->This() >> x;
+ t = boost::archive::tracking_type(x);
+ }
+ else{
+ bool x=0;
+ * this->This() >> x;
+ t = boost::archive::tracking_type(x);
+ }
+ }
void load_override(class_id_type & t, int version){
library_version_type lvt = this->get_library_version();
if(boost::archive::library_version_type(7) < lvt){
@@ -134,6 +146,12 @@
}
else
if(boost::archive::library_version_type(6) < lvt){
+ uint_least8_t x=0;
+ * this->This() >> x;
+ t = boost::archive::version_type(x);
+ }
+ else
+ if(boost::archive::library_version_type(5) < lvt){
uint_least16_t x=0;
* this->This() >> x;
t = boost::archive::version_type(x);
@@ -147,7 +165,8 @@
void load_override(boost::serialization::item_version_type & t, int version){
library_version_type lvt = this->get_library_version();
- if(boost::archive::library_version_type(7) < lvt){
+// if(boost::archive::library_version_type(7) < lvt){
+ if(boost::archive::library_version_type(6) < lvt){
this->detail_common_iarchive::load_override(t, version);
}
else
Modified: branches/release/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_iprimitive.hpp (original)
+++ branches/release/boost/archive/basic_binary_iprimitive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/basic_binary_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oarchive.hpp (original)
+++ branches/release/boost/archive/basic_binary_oarchive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_binary_oprimitive.hpp (original)
+++ branches/release/boost/archive/basic_binary_oprimitive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/basic_text_iprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_iprimitive.hpp (original)
+++ branches/release/boost/archive/basic_text_iprimitive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/basic_text_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_oarchive.hpp (original)
+++ branches/release/boost/archive/basic_text_oarchive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/basic_text_oprimitive.hpp
==============================================================================
--- branches/release/boost/archive/basic_text_oprimitive.hpp (original)
+++ branches/release/boost/archive/basic_text_oprimitive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/detail/basic_serializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/basic_serializer.hpp (original)
+++ branches/release/boost/archive/detail/basic_serializer.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/detail/oserializer.hpp
==============================================================================
--- branches/release/boost/archive/detail/oserializer.hpp (original)
+++ branches/release/boost/archive/detail/oserializer.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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,12 +433,12 @@
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(
archive_exception::unregistered_class,
- bpos->get_debug_info()
+ "derived class not registered or exported"
)
);
ar.save_pointer(vp, bpos);
Modified: branches/release/boost/archive/impl/basic_binary_iarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_iarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_binary_iarchive.ipp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/impl/basic_binary_iprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_iprimitive.ipp (original)
+++ branches/release/boost/archive/impl/basic_binary_iprimitive.ipp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/impl/basic_binary_oarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_binary_oarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_binary_oarchive.ipp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/impl/basic_text_iprimitive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_iprimitive.ipp (original)
+++ branches/release/boost/archive/impl/basic_text_iprimitive.ipp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/impl/basic_text_oarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_text_oarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_text_oarchive.ipp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/impl/basic_xml_iarchive.ipp
==============================================================================
--- branches/release/boost/archive/impl/basic_xml_iarchive.ipp (original)
+++ branches/release/boost/archive/impl/basic_xml_iarchive.ipp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/impl/xml_wiarchive_impl.ipp
==============================================================================
--- branches/release/boost/archive/impl/xml_wiarchive_impl.ipp (original)
+++ branches/release/boost/archive/impl/xml_wiarchive_impl.ipp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/base64_exception.hpp
==============================================================================
--- branches/release/boost/archive/iterators/base64_exception.hpp (original)
+++ branches/release/boost/archive/iterators/base64_exception.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/base64_from_binary.hpp
==============================================================================
--- branches/release/boost/archive/iterators/base64_from_binary.hpp (original)
+++ branches/release/boost/archive/iterators/base64_from_binary.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/binary_from_base64.hpp
==============================================================================
--- branches/release/boost/archive/iterators/binary_from_base64.hpp (original)
+++ branches/release/boost/archive/iterators/binary_from_base64.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/dataflow.hpp
==============================================================================
--- branches/release/boost/archive/iterators/dataflow.hpp (original)
+++ branches/release/boost/archive/iterators/dataflow.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/dataflow_exception.hpp
==============================================================================
--- branches/release/boost/archive/iterators/dataflow_exception.hpp (original)
+++ branches/release/boost/archive/iterators/dataflow_exception.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/escape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/escape.hpp (original)
+++ branches/release/boost/archive/iterators/escape.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/insert_linebreaks.hpp
==============================================================================
--- branches/release/boost/archive/iterators/insert_linebreaks.hpp (original)
+++ branches/release/boost/archive/iterators/insert_linebreaks.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/mb_from_wchar.hpp
==============================================================================
--- branches/release/boost/archive/iterators/mb_from_wchar.hpp (original)
+++ branches/release/boost/archive/iterators/mb_from_wchar.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/remove_whitespace.hpp
==============================================================================
--- branches/release/boost/archive/iterators/remove_whitespace.hpp (original)
+++ branches/release/boost/archive/iterators/remove_whitespace.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/unescape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/unescape.hpp (original)
+++ branches/release/boost/archive/iterators/unescape.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/wchar_from_mb.hpp
==============================================================================
--- branches/release/boost/archive/iterators/wchar_from_mb.hpp (original)
+++ branches/release/boost/archive/iterators/wchar_from_mb.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/xml_escape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/xml_escape.hpp (original)
+++ branches/release/boost/archive/iterators/xml_escape.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/xml_unescape.hpp
==============================================================================
--- branches/release/boost/archive/iterators/xml_unescape.hpp (original)
+++ branches/release/boost/archive/iterators/xml_unescape.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/iterators/xml_unescape_exception.hpp
==============================================================================
--- branches/release/boost/archive/iterators/xml_unescape_exception.hpp (original)
+++ branches/release/boost/archive/iterators/xml_unescape_exception.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -20,7 +20,7 @@
#ifndef BOOST_NO_EXCEPTIONS
#include <exception>
-#include <cassert>
+#include <boost/assert.hpp>
namespace boost {
namespace archive {
Modified: branches/release/boost/archive/text_iarchive.hpp
==============================================================================
--- branches/release/boost/archive/text_iarchive.hpp (original)
+++ branches/release/boost/archive/text_iarchive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -87,7 +87,8 @@
init();
BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
text_iarchive_impl(std::istream & is, unsigned int flags);
- BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
+ // don't import inline definitions! leave this as a reminder.
+ //BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
~text_iarchive_impl(){};
};
Modified: branches/release/boost/archive/text_oarchive.hpp
==============================================================================
--- branches/release/boost/archive/text_oarchive.hpp (original)
+++ branches/release/boost/archive/text_oarchive.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -80,7 +80,8 @@
#endif
BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
text_oarchive_impl(std::ostream & os, unsigned int flags);
- BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
+ // don't import inline definitions! leave this as a reminder.
+ //BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY())
~text_oarchive_impl(){};
public:
BOOST_ARCHIVE_DECL(void)
Modified: branches/release/boost/archive/tmpdir.hpp
==============================================================================
--- branches/release/boost/archive/tmpdir.hpp (original)
+++ branches/release/boost/archive/tmpdir.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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: branches/release/boost/archive/xml_archive_exception.hpp
==============================================================================
--- branches/release/boost/archive/xml_archive_exception.hpp (original)
+++ branches/release/boost/archive/xml_archive_exception.hpp 2011-01-19 12:33:55 EST (Wed, 19 Jan 2011)
@@ -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>
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