Updated Boost libraries to version 1.49, and recompiled them with NDK r8d
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -124,14 +124,14 @@ namespace extra_detail {
|
||||
|
||||
template<class T>
|
||||
struct guid_initializer
|
||||
{
|
||||
{
|
||||
void export_guid(mpl::false_) const {
|
||||
// generates the statically-initialized objects whose constructors
|
||||
// register the information allowing serialization of T objects
|
||||
// through pointers to their base classes.
|
||||
instantiate_ptr_serialization((T*)0, 0, adl_tag());
|
||||
}
|
||||
const void export_guid(mpl::true_) const {
|
||||
void export_guid(mpl::true_) const {
|
||||
}
|
||||
guid_initializer const & export_guid() const {
|
||||
BOOST_STATIC_WARNING(boost::is_polymorphic< T >::value);
|
||||
|
||||
@@ -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>
|
||||
@@ -91,9 +91,21 @@ public:
|
||||
|
||||
template<class T>
|
||||
struct guid_defined : boost::mpl::false_ {};
|
||||
|
||||
namespace ext {
|
||||
template <typename T>
|
||||
struct guid_impl
|
||||
{
|
||||
static inline const char * call()
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
template<class T>
|
||||
inline const char * guid(){
|
||||
return NULL;
|
||||
return ext::guid_impl<T>::call();
|
||||
}
|
||||
|
||||
} // namespace serialization
|
||||
|
||||
@@ -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 @@ 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<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;
|
||||
}
|
||||
|
||||
@@ -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 @@ public:
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace serialization {
|
||||
// default implementation does nothing.
|
||||
template<class T, int N>
|
||||
T * factory(std::va_list){
|
||||
assert(false);
|
||||
BOOST_ASSERT(false);
|
||||
// throw exception here?
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -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 @@ 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<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)
|
||||
|
||||
@@ -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 @@ 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 &>(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(){
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
{ \
|
||||
T t; \
|
||||
explicit D(const T t_) : t(t_) {}; \
|
||||
D(){}; \
|
||||
D(): t() {}; \
|
||||
D(const D & t_) : t(t_.t){} \
|
||||
D & operator=(const D & rhs) { t = rhs.t; return *this;} \
|
||||
D & operator=(const T & rhs) { t = rhs; return *this;} \
|
||||
@@ -52,7 +52,7 @@
|
||||
{ \
|
||||
T t; \
|
||||
explicit D(const T t_) : t(t_) {}; \
|
||||
D(){}; \
|
||||
D() : t(){}; \
|
||||
D(const D & t_) : t(t_.t){} \
|
||||
D & operator=(const D & rhs) { t = rhs.t; return *this;} \
|
||||
D & operator=(const T & rhs) { t = rhs; return *this;} \
|
||||
|
||||
@@ -52,6 +52,11 @@ struct version
|
||||
BOOST_STATIC_CONSTANT(int, value = version::type::value);
|
||||
};
|
||||
|
||||
#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
|
||||
template<class T>
|
||||
const int version<T>::value;
|
||||
#endif
|
||||
|
||||
} // namespace serialization
|
||||
} // namespace boost
|
||||
|
||||
|
||||
Reference in New Issue
Block a user