Fix submodules for realsies
This commit is contained in:
@@ -80,10 +80,14 @@ BOOST_ARCHIVE_SIGNATURE(){
|
||||
// 16- eliminated dependency on <codecvt> which is buggy in some libraries
|
||||
// and now officially deprecated in the standard
|
||||
// 17- Boost 1.68 August 2018
|
||||
// 18- addressed undefined behavior in archive constuctors.
|
||||
// init() called from base wrote archive header before archive
|
||||
// was fully constructed.
|
||||
// Boost 1.76
|
||||
|
||||
BOOST_SYMBOL_VISIBLE library_version_type
|
||||
BOOST_SYMBOL_VISIBLE boost::serialization::library_version_type
|
||||
BOOST_ARCHIVE_VERSION(){
|
||||
return library_version_type(17);
|
||||
return boost::serialization::library_version_type(19);
|
||||
}
|
||||
|
||||
} // namespace archive
|
||||
|
||||
@@ -257,7 +257,10 @@ basic_iarchive_impl::reset_object_address(
|
||||
break;
|
||||
}
|
||||
for(; i < m_moveable_objects.end; ++i){
|
||||
void const * const this_address = object_id_vector[i].address;
|
||||
const aobject & ao = object_id_vector[i];
|
||||
if(ao.loaded_as_pointer)
|
||||
continue;
|
||||
void const * const this_address = ao.address;
|
||||
// calculate displacement from this level
|
||||
// warning - pointer arithmetic on void * is in herently non-portable
|
||||
// but expected to work on all platforms in current usage
|
||||
@@ -424,7 +427,7 @@ basic_iarchive_impl::load_pointer(
|
||||
class_id_type cid;
|
||||
load(ar, cid);
|
||||
|
||||
if(NULL_POINTER_TAG == cid){
|
||||
if(BOOST_SERIALIZATION_NULL_POINTER_TAG == cid){
|
||||
t = NULL;
|
||||
return bpis_ptr;
|
||||
}
|
||||
@@ -497,7 +500,6 @@ basic_iarchive_impl::load_pointer(
|
||||
|
||||
serialization::state_saver<object_id_type> w_end(m_moveable_objects.end);
|
||||
|
||||
|
||||
// add to list of serialized objects so that we can properly handle
|
||||
// cyclic strucures
|
||||
object_id_vector.push_back(aobject(t, cid));
|
||||
@@ -584,7 +586,7 @@ basic_iarchive::delete_created_pointers()
|
||||
pimpl->delete_created_pointers();
|
||||
}
|
||||
|
||||
BOOST_ARCHIVE_DECL boost::archive::library_version_type
|
||||
BOOST_ARCHIVE_DECL boost::serialization::library_version_type
|
||||
basic_iarchive::get_library_version() const{
|
||||
return pimpl->m_archive_library_version;
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ class basic_oarchive_impl {
|
||||
// keyed on object id
|
||||
std::set<object_id_type> stored_pointers;
|
||||
|
||||
// address of the most recent object serialized as a poiner
|
||||
// address of the most recent object serialized as a pointer
|
||||
// whose data itself is now pending serialization
|
||||
const void * pending_object;
|
||||
const basic_oserializer * pending_bos;
|
||||
@@ -179,28 +179,28 @@ basic_oarchive_impl::find(const serialization::extended_type_info & ti) const {
|
||||
class bosarg :
|
||||
public basic_oserializer
|
||||
{
|
||||
bool class_info() const {
|
||||
bool class_info() const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return false;
|
||||
}
|
||||
// returns true if objects should be tracked
|
||||
bool tracking(const unsigned int) const {
|
||||
bool tracking(const unsigned int) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return false;
|
||||
}
|
||||
// returns class version
|
||||
version_type version() const {
|
||||
version_type version() const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return version_type(0);
|
||||
}
|
||||
// returns true if this class is polymorphic
|
||||
bool is_polymorphic() const{
|
||||
bool is_polymorphic() const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return false;
|
||||
}
|
||||
void save_object_data(
|
||||
basic_oarchive & /*ar*/, const void * /*x*/
|
||||
) const {
|
||||
) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
}
|
||||
public:
|
||||
@@ -306,10 +306,9 @@ basic_oarchive_impl::save_object(
|
||||
// just save the object id
|
||||
ar.vsave(object_reference_type(oid));
|
||||
ar.end_preamble();
|
||||
return;
|
||||
}
|
||||
|
||||
// save a pointer to an object instance
|
||||
// colle
|
||||
inline void
|
||||
basic_oarchive_impl::save_pointer(
|
||||
basic_oarchive & ar,
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
namespace boost {
|
||||
namespace archive {
|
||||
|
||||
std::codecvt_base::result
|
||||
BOOST_SYMBOL_EXPORT std::codecvt_base::result
|
||||
codecvt_null<wchar_t>::do_out(
|
||||
std::mbstate_t & /*state*/,
|
||||
const wchar_t * first1,
|
||||
@@ -46,7 +46,7 @@ codecvt_null<wchar_t>::do_out(
|
||||
return std::codecvt_base::ok;
|
||||
}
|
||||
|
||||
std::codecvt_base::result
|
||||
BOOST_SYMBOL_EXPORT std::codecvt_base::result
|
||||
codecvt_null<wchar_t>::do_in(
|
||||
std::mbstate_t & /*state*/,
|
||||
const char * first1,
|
||||
@@ -80,5 +80,12 @@ codecvt_null<wchar_t>::do_in(
|
||||
return std::codecvt_base::ok;
|
||||
}
|
||||
|
||||
BOOST_SYMBOL_EXPORT codecvt_null<wchar_t>::codecvt_null(std::size_t no_locale_manage) :
|
||||
std::codecvt<wchar_t, char, std::mbstate_t>(no_locale_manage)
|
||||
{}
|
||||
|
||||
BOOST_SYMBOL_EXPORT codecvt_null<wchar_t>::~codecvt_null()
|
||||
{}
|
||||
|
||||
} // namespace archive
|
||||
} // namespace boost
|
||||
|
||||
@@ -79,24 +79,24 @@ typedef std::multiset<const extended_type_info *, key_compare> ktmap;
|
||||
|
||||
class extended_type_info_arg : public extended_type_info
|
||||
{
|
||||
virtual bool
|
||||
is_less_than(const extended_type_info & /*rhs*/) const {
|
||||
bool
|
||||
is_less_than(const extended_type_info & /*rhs*/) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return false;
|
||||
};
|
||||
virtual bool
|
||||
is_equal(const extended_type_info & /*rhs*/) const {
|
||||
}
|
||||
bool
|
||||
is_equal(const extended_type_info & /*rhs*/) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return false;
|
||||
};
|
||||
virtual const char * get_debug_info() const {
|
||||
}
|
||||
const char * get_debug_info() const BOOST_OVERRIDE {
|
||||
return get_key();
|
||||
}
|
||||
virtual void * construct(unsigned int /*count*/, ...) const{
|
||||
void * construct(unsigned int /*count*/, ...) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return NULL;
|
||||
}
|
||||
virtual void destroy(void const * const /*p*/) const {
|
||||
void destroy(void const * const /*p*/) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
}
|
||||
public:
|
||||
@@ -104,8 +104,7 @@ public:
|
||||
extended_type_info(0, key)
|
||||
{}
|
||||
|
||||
~extended_type_info_arg(){
|
||||
}
|
||||
~extended_type_info_arg() BOOST_OVERRIDE {}
|
||||
};
|
||||
|
||||
#ifdef BOOST_MSVC
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
// See http://www.boost.org for updates, documentation, and revision history.
|
||||
|
||||
#include <algorithm>
|
||||
#include <set>
|
||||
#include <boost/assert.hpp>
|
||||
#include <typeinfo>
|
||||
#include <cstddef> // NULL
|
||||
#include <set>
|
||||
#include <typeinfo>
|
||||
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/core/no_exceptions_support.hpp>
|
||||
|
||||
// it marks our code with proper attributes as being exported when
|
||||
@@ -105,12 +105,12 @@ extended_type_info_typeid_0::type_unregister()
|
||||
|
||||
// remove all entries in map which corresponds to this type
|
||||
// make sure that we don't use any invalidated iterators
|
||||
for(;;){
|
||||
while(true){
|
||||
const tkmap::iterator & it = x.find(this);
|
||||
if(it == x.end())
|
||||
break;
|
||||
x.erase(it);
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
m_ti = NULL;
|
||||
@@ -125,23 +125,23 @@ extended_type_info_typeid_0::type_unregister()
|
||||
class extended_type_info_typeid_arg :
|
||||
public extended_type_info_typeid_0
|
||||
{
|
||||
virtual void * construct(unsigned int /*count*/, ...) const{
|
||||
void * construct(unsigned int /*count*/, ...) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return NULL;
|
||||
}
|
||||
virtual void destroy(void const * const /*p*/) const {
|
||||
void destroy(void const * const /*p*/) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
}
|
||||
public:
|
||||
extended_type_info_typeid_arg(const std::type_info & ti) :
|
||||
extended_type_info_typeid_0(NULL)
|
||||
{
|
||||
// note absense of self register and key as this is used only as
|
||||
// note absence of self register and key as this is used only as
|
||||
// search argument given a type_info reference and is not to
|
||||
// be added to the map.
|
||||
m_ti = & ti;
|
||||
}
|
||||
~extended_type_info_typeid_arg(){
|
||||
~extended_type_info_typeid_arg() BOOST_OVERRIDE {
|
||||
m_ti = NULL;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -43,7 +43,7 @@ namespace void_cast_detail {
|
||||
// member extended type info records - NOT their
|
||||
// addresses. This is necessary in order for the
|
||||
// void cast operations to work across dll and exe
|
||||
// module boundries.
|
||||
// module boundaries.
|
||||
bool void_caster::operator<(const void_caster & rhs) const {
|
||||
// include short cut to save time and eliminate
|
||||
// problems when when base class aren't virtual
|
||||
@@ -87,14 +87,14 @@ class void_caster_shortcut : public void_caster
|
||||
vbc_downcast(
|
||||
void const * const t
|
||||
) const;
|
||||
virtual void const *
|
||||
upcast(void const * const t) const{
|
||||
void const *
|
||||
upcast(void const * const t) const BOOST_OVERRIDE {
|
||||
if(m_includes_virtual_base)
|
||||
return vbc_upcast(t);
|
||||
return static_cast<const char *> ( t ) - m_difference;
|
||||
}
|
||||
virtual void const *
|
||||
downcast(void const * const t) const{
|
||||
void const *
|
||||
downcast(void const * const t) const BOOST_OVERRIDE {
|
||||
if(m_includes_virtual_base)
|
||||
return vbc_downcast(t);
|
||||
return static_cast<const char *> ( t ) + m_difference;
|
||||
@@ -102,7 +102,7 @@ class void_caster_shortcut : public void_caster
|
||||
virtual bool is_shortcut() const {
|
||||
return true;
|
||||
}
|
||||
virtual bool has_virtual_base() const {
|
||||
bool has_virtual_base() const BOOST_OVERRIDE {
|
||||
return m_includes_virtual_base;
|
||||
}
|
||||
public:
|
||||
@@ -118,7 +118,7 @@ public:
|
||||
{
|
||||
recursive_register(includes_virtual_base);
|
||||
}
|
||||
virtual ~void_caster_shortcut(){
|
||||
~void_caster_shortcut() BOOST_OVERRIDE {
|
||||
recursive_unregister();
|
||||
}
|
||||
};
|
||||
@@ -187,17 +187,17 @@ void_caster_shortcut::vbc_upcast(
|
||||
// just used as a search key
|
||||
class void_caster_argument : public void_caster
|
||||
{
|
||||
virtual void const *
|
||||
upcast(void const * const /*t*/) const {
|
||||
void const *
|
||||
upcast(void const * const /*t*/) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return NULL;
|
||||
}
|
||||
virtual void const *
|
||||
downcast( void const * const /*t*/) const {
|
||||
void const *
|
||||
downcast( void const * const /*t*/) const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return NULL;
|
||||
}
|
||||
virtual bool has_virtual_base() const {
|
||||
bool has_virtual_base() const BOOST_OVERRIDE {
|
||||
BOOST_ASSERT(false);
|
||||
return false;
|
||||
}
|
||||
@@ -208,7 +208,7 @@ public:
|
||||
) :
|
||||
void_caster(derived, base)
|
||||
{}
|
||||
virtual ~void_caster_argument(){};
|
||||
~void_caster_argument() BOOST_OVERRIDE {}
|
||||
};
|
||||
|
||||
#ifdef BOOST_MSVC
|
||||
|
||||
Reference in New Issue
Block a user