8 changes: 2 additions & 6 deletions include/boost/archive/binary_iarchive_impl.hpp
View file
Expand Up @@ -17,7 +17,6 @@
// See http://www.boost.org for updates, documentation, and revision history.

#include <istream>
#include <boost/serialization/pfto.hpp>
#include <boost/archive/basic_binary_iprimitive.hpp>
#include <boost/archive/basic_binary_iarchive.hpp>

Expand Down Expand Up @@ -54,12 +53,9 @@ class binary_iarchive_impl :
friend class load_access;
#endif
#endif
// note: the following should not needed - but one compiler (vc 7.1)
// fails to compile one test (test_shared_ptr) without it !!!
// make this protected so it can be called from a derived archive
template<class T>
void load_override(T & t, BOOST_PFTO int){
this->basic_binary_iarchive<Archive>::load_override(t, 0L);
void load_override(T & t){
this->basic_binary_iarchive<Archive>::load_override(t);
}
void init(unsigned int flags){
if(0 != (flags & no_header))
Expand Down
8 changes: 2 additions & 6 deletions include/boost/archive/binary_oarchive_impl.hpp
View file
Expand Up @@ -18,7 +18,6 @@

#include <ostream>
#include <boost/config.hpp>
#include <boost/serialization/pfto.hpp>
#include <boost/archive/basic_binary_oprimitive.hpp>
#include <boost/archive/basic_binary_oarchive.hpp>

Expand Down Expand Up @@ -55,12 +54,9 @@ class binary_oarchive_impl :
friend class save_access;
#endif
#endif
// note: the following should not needed - but one compiler (vc 7.1)
// fails to compile one test (test_shared_ptr) without it !!!
// make this protected so it can be called from a derived archive
template<class T>
void save_override(T & t, BOOST_PFTO int){
this->basic_binary_oarchive<Archive>::save_override(t, 0L);
void save_override(T & t){
this->basic_binary_oarchive<Archive>::save_override(t);
}
void init(unsigned int flags) {
if(0 != (flags & no_header))
Expand Down
2 changes: 1 addition & 1 deletion include/boost/archive/detail/common_iarchive.hpp
View file
Expand Up @@ -62,7 +62,7 @@ class common_iarchive :
protected:
// default processing - invoke serialization library
template<class T>
void load_override(T & t, BOOST_PFTO int){
void load_override(T & t){
archive::load(* this->This(), t);
}
// default implementations of functions which emit start/end tags for
Expand Down
2 changes: 1 addition & 1 deletion include/boost/archive/detail/common_oarchive.hpp
View file
Expand Up @@ -65,7 +65,7 @@ class common_oarchive :
protected:
// default processing - invoke serialization library
template<class T>
void save_override(T & t, BOOST_PFTO int){
void save_override(T & t){
archive::save(* this->This(), t);
}
void save_start(const char * /*name*/){}
Expand Down
2 changes: 1 addition & 1 deletion include/boost/archive/detail/interface_iarchive.hpp
View file
Expand Up @@ -57,7 +57,7 @@ class interface_iarchive
}
template<class T>
Archive & operator>>(T & t){
this->This()->load_override(t, 0);
this->This()->load_override(t);
return * this->This();
}

Expand Down
2 changes: 1 addition & 1 deletion include/boost/archive/detail/interface_oarchive.hpp
View file
Expand Up @@ -60,7 +60,7 @@ class interface_oarchive

template<class T>
Archive & operator<<(T & t){
this->This()->save_override(t, 0);
this->This()->save_override(t);
return * this->This();
}

Expand Down
4 changes: 2 additions & 2 deletions include/boost/archive/impl/basic_binary_iarchive.ipp
View file
Expand Up @@ -33,10 +33,10 @@ namespace archive {
// implementation of binary_binary_archive
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_binary_iarchive<Archive>::load_override(class_name_type & t, int){
basic_binary_iarchive<Archive>::load_override(class_name_type & t){
std::string cn;
cn.reserve(BOOST_SERIALIZATION_MAX_KEY_SIZE);
load_override(cn, 0);
load_override(cn);
if(cn.size() > (BOOST_SERIALIZATION_MAX_KEY_SIZE - 1))
boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_class_name)
Expand Down
4 changes: 2 additions & 2 deletions include/boost/archive/impl/basic_text_iarchive.ipp
View file
Expand Up @@ -30,10 +30,10 @@ namespace archive {

template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_text_iarchive<Archive>::load_override(class_name_type & t, int){
basic_text_iarchive<Archive>::load_override(class_name_type & t){
std::string cn;
cn.reserve(BOOST_SERIALIZATION_MAX_KEY_SIZE);
load_override(cn, 0);
load_override(cn);
if(cn.size() > (BOOST_SERIALIZATION_MAX_KEY_SIZE - 1))
boost::serialization::throw_exception(
archive_exception(archive_exception::invalid_class_name)
Expand Down
7 changes: 1 addition & 6 deletions include/boost/archive/impl/basic_text_iprimitive.ipp
View file
Expand Up @@ -19,7 +19,6 @@ namespace std{
#endif

#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/pfto.hpp>

#include <boost/archive/basic_text_iprimitive.hpp>
#include <boost/archive/codecvt_null.hpp>
Expand Down Expand Up @@ -87,11 +86,7 @@ basic_text_iprimitive<IStream>::load_binary(
>
binary;

binary i = binary(
BOOST_MAKE_PFTO_WRAPPER(
iterators::istream_iterator<CharType>(is)
)
);
binary i = binary(iterators::istream_iterator<CharType>(is));

char * caddr = static_cast<char *>(address);

Expand Down
5 changes: 2 additions & 3 deletions include/boost/archive/impl/basic_text_oprimitive.ipp
View file
Expand Up @@ -10,7 +10,6 @@

#include <cstddef> // NULL
#include <algorithm> // std::copy
#include <boost/serialization/pfto.hpp>

#include <boost/archive/basic_text_oprimitive.hpp>
#include <boost/archive/codecvt_null.hpp>
Expand Down Expand Up @@ -59,9 +58,9 @@ basic_text_oprimitive<OStream>::save_binary(

boost::archive::iterators::ostream_iterator<CharType> oi(os);
std::copy(
base64_text(BOOST_MAKE_PFTO_WRAPPER(static_cast<const char *>(address))),
base64_text(static_cast<const char *>(address)),
base64_text(
BOOST_MAKE_PFTO_WRAPPER(static_cast<const char *>(address) + count)
static_cast<const char *>(address) + count
),
oi
);
Expand Down
8 changes: 4 additions & 4 deletions include/boost/archive/impl/basic_xml_iarchive.ipp
View file
Expand Up @@ -78,25 +78,25 @@ basic_xml_iarchive<Archive>::load_end(const char *name){

template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_iarchive<Archive>::load_override(object_id_type & t, int){
basic_xml_iarchive<Archive>::load_override(object_id_type & t){
t = object_id_type(this->This()->gimpl->rv.object_id);
}

template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_iarchive<Archive>::load_override(version_type & t, int){
basic_xml_iarchive<Archive>::load_override(version_type & t){
t = version_type(this->This()->gimpl->rv.version);
}

template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_iarchive<Archive>::load_override(class_id_type & t, int){
basic_xml_iarchive<Archive>::load_override(class_id_type & t){
t = class_id_type(this->This()->gimpl->rv.class_id);
}

template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_iarchive<Archive>::load_override(tracking_type & t, int){
basic_xml_iarchive<Archive>::load_override(tracking_type & t){
t = this->This()->gimpl->rv.tracking_level;
}

Expand Down
23 changes: 10 additions & 13 deletions include/boost/archive/impl/basic_xml_oarchive.ipp
View file
Expand Up @@ -149,7 +149,7 @@ basic_xml_oarchive<Archive>::end_preamble(){
#if 0
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(const object_id_type & t, int)
basic_xml_oarchive<Archive>::save_override(const object_id_type & t)
{
int i = t.t; // extra .t is for borland
write_attribute(BOOST_ARCHIVE_XML_OBJECT_ID(), i, "=\"_");
Expand All @@ -165,7 +165,7 @@ basic_xml_oarchive<Archive>::save_override(
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(const version_type & t, int)
basic_xml_oarchive<Archive>::save_override(const version_type & t)
{
int i = t.t; // extra .t is for borland
write_attribute(BOOST_ARCHIVE_XML_VERSION(), i);
Expand All @@ -174,7 +174,7 @@ basic_xml_oarchive<Archive>::save_override(const version_type & t, int)

template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(const object_id_type & t, int)
basic_xml_oarchive<Archive>::save_override(const object_id_type & t)
{
// borland doesn't do conversion of STRONG_TYPEDEFs very well
const unsigned int i = t;
Expand All @@ -183,45 +183,42 @@ basic_xml_oarchive<Archive>::save_override(const object_id_type & t, int)
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(
const object_reference_type & t,
int
const object_reference_type & t
){
const unsigned int i = t;
write_attribute(BOOST_ARCHIVE_XML_OBJECT_REFERENCE(), i, "=\"_");
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(const version_type & t, int)
basic_xml_oarchive<Archive>::save_override(const version_type & t)
{
const unsigned int i = t;
write_attribute(BOOST_ARCHIVE_XML_VERSION(), i);
}

template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(const class_id_type & t, int)
basic_xml_oarchive<Archive>::save_override(const class_id_type & t)
{
write_attribute(BOOST_ARCHIVE_XML_CLASS_ID(), t);
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(
const class_id_reference_type & t,
int
const class_id_reference_type & t
){
write_attribute(BOOST_ARCHIVE_XML_CLASS_ID_REFERENCE(), t);
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(
const class_id_optional_type & t,
int
const class_id_optional_type & t
){
write_attribute(BOOST_ARCHIVE_XML_CLASS_ID(), t);
}
template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(const class_name_type & t, int)
basic_xml_oarchive<Archive>::save_override(const class_name_type & t)
{
const char * key = t;
if(NULL == key)
Expand All @@ -231,7 +228,7 @@ basic_xml_oarchive<Archive>::save_override(const class_name_type & t, int)

template<class Archive>
BOOST_ARCHIVE_OR_WARCHIVE_DECL void
basic_xml_oarchive<Archive>::save_override(const tracking_type & t, int)
basic_xml_oarchive<Archive>::save_override(const tracking_type & t)
{
write_attribute(BOOST_ARCHIVE_XML_TRACKING(), t.t);
}
Expand Down
4 changes: 2 additions & 2 deletions include/boost/archive/impl/text_iarchive_impl.ipp
View file
Expand Up @@ -94,8 +94,8 @@ text_iarchive_impl<Archive>::load(std::wstring &ws)

template<class Archive>
BOOST_ARCHIVE_DECL void
text_iarchive_impl<Archive>::load_override(class_name_type & t, int){
basic_text_iarchive<Archive>::load_override(t, 0);
text_iarchive_impl<Archive>::load_override(class_name_type & t){
basic_text_iarchive<Archive>::load_override(t);
}

template<class Archive>
Expand Down
2 changes: 1 addition & 1 deletion include/boost/archive/impl/xml_iarchive_impl.ipp
View file
Expand Up @@ -141,7 +141,7 @@ xml_iarchive_impl<Archive>::load(char * s){

template<class Archive>
BOOST_ARCHIVE_DECL void
xml_iarchive_impl<Archive>::load_override(class_name_type & t, int){
xml_iarchive_impl<Archive>::load_override(class_name_type & t){
const std::string & s = gimpl->rv.class_name;
if(s.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1)
boost::serialization::throw_exception(
Expand Down
12 changes: 6 additions & 6 deletions include/boost/archive/impl/xml_oarchive_impl.ipp
View file
Expand Up @@ -42,8 +42,8 @@ void save_iterator(std::ostream &os, InputIterator begin, InputIterator end){
boost::archive::iterators::xml_escape<InputIterator>
> translator;
std::copy(
translator(BOOST_MAKE_PFTO_WRAPPER(begin)),
translator(BOOST_MAKE_PFTO_WRAPPER(end)),
translator(begin),
translator(end),
boost::archive::iterators::ostream_iterator<char>(os)
);
}
Expand Down Expand Up @@ -78,8 +78,8 @@ xml_oarchive_impl<Archive>::save(const std::string & s){
const char *
> xml_escape_translator;
std::copy(
xml_escape_translator(BOOST_MAKE_PFTO_WRAPPER(s.data())),
xml_escape_translator(BOOST_MAKE_PFTO_WRAPPER(s.data()+ s.size())),
xml_escape_translator(s.data()),
xml_escape_translator(s.data()+ s.size()),
boost::archive::iterators::ostream_iterator<char>(os)
);
}
Expand All @@ -91,8 +91,8 @@ xml_oarchive_impl<Archive>::save(const char * s){
const char *
> xml_escape_translator;
std::copy(
xml_escape_translator(BOOST_MAKE_PFTO_WRAPPER(s)),
xml_escape_translator(BOOST_MAKE_PFTO_WRAPPER(s + std::strlen(s))),
xml_escape_translator(s),
xml_escape_translator(s + std::strlen(s)),
boost::archive::iterators::ostream_iterator<char>(os)
);
}
Expand Down
11 changes: 5 additions & 6 deletions include/boost/archive/impl/xml_wiarchive_impl.ipp
View file
Expand Up @@ -28,7 +28,6 @@ namespace std{

#include <boost/io/ios_state.hpp>
#include <boost/core/no_exceptions_support.hpp>
#include <boost/serialization/pfto.hpp>
#include <boost/serialization/string.hpp>

#include <boost/archive/basic_xml_archive.hpp>
Expand All @@ -52,10 +51,10 @@ namespace { // anonymous
void copy_to_ptr(char * s, const std::wstring & ws){
std::copy(
iterators::mb_from_wchar<std::wstring::const_iterator>(
BOOST_MAKE_PFTO_WRAPPER(ws.begin())
ws.begin()
),
iterators::mb_from_wchar<std::wstring::const_iterator>(
BOOST_MAKE_PFTO_WRAPPER(ws.end())
ws.end()
),
s
);
Expand All @@ -80,10 +79,10 @@ xml_wiarchive_impl<Archive>::load(std::string & s){
s.reserve(ws.size());
std::copy(
iterators::mb_from_wchar<std::wstring::iterator>(
BOOST_MAKE_PFTO_WRAPPER(ws.begin())
ws.begin()
),
iterators::mb_from_wchar<std::wstring::iterator>(
BOOST_MAKE_PFTO_WRAPPER(ws.end())
ws.end()
),
std::back_inserter(s)
);
Expand Down Expand Up @@ -130,7 +129,7 @@ xml_wiarchive_impl<Archive>::load(wchar_t * ws){

template<class Archive>
BOOST_WARCHIVE_DECL void
xml_wiarchive_impl<Archive>::load_override(class_name_type & t, int){
xml_wiarchive_impl<Archive>::load_override(class_name_type & t){
const std::wstring & ws = gimpl->rv.class_name;
if(ws.size() > BOOST_SERIALIZATION_MAX_KEY_SIZE - 1)
boost::serialization::throw_exception(
Expand Down
16 changes: 8 additions & 8 deletions include/boost/archive/impl/xml_woarchive_impl.ipp
View file
Expand Up @@ -52,8 +52,8 @@ void save_iterator(std::wostream &os, InputIterator begin, InputIterator end){
iterators::xml_escape<InputIterator>
> xmbtows;
std::copy(
xmbtows(BOOST_MAKE_PFTO_WRAPPER(begin)),
xmbtows(BOOST_MAKE_PFTO_WRAPPER(end)),
xmbtows(begin),
xmbtows(end),
boost::archive::iterators::ostream_iterator<wchar_t>(os)
);
}
Expand All @@ -76,15 +76,15 @@ xml_woarchive_impl<Archive>::save(const std::wstring & ws){
#if 0
typedef iterators::xml_escape<std::wstring::const_iterator> xmbtows;
std::copy(
xmbtows(BOOST_MAKE_PFTO_WRAPPER(ws.begin())),
xmbtows(BOOST_MAKE_PFTO_WRAPPER(ws.end())),
xmbtows(ws.begin()),
xmbtows(ws.end()),
boost::archive::iterators::ostream_iterator<wchar_t>(os)
);
#endif
typedef iterators::xml_escape<const wchar_t *> xmbtows;
std::copy(
xmbtows(BOOST_MAKE_PFTO_WRAPPER(ws.data())),
xmbtows(BOOST_MAKE_PFTO_WRAPPER(ws.data() + ws.size())),
xmbtows(ws.data()),
xmbtows(ws.data() + ws.size()),
boost::archive::iterators::ostream_iterator<wchar_t>(os)
);
}
Expand All @@ -103,8 +103,8 @@ xml_woarchive_impl<Archive>::save(const wchar_t * ws){
os << ws;
typedef iterators::xml_escape<const wchar_t *> xmbtows;
std::copy(
xmbtows(BOOST_MAKE_PFTO_WRAPPER(ws)),
xmbtows(BOOST_MAKE_PFTO_WRAPPER(ws + std::wcslen(ws))),
xmbtows(ws),
xmbtows(ws + std::wcslen(ws)),
boost::archive::iterators::ostream_iterator<wchar_t>(os)
);
}
Expand Down
6 changes: 2 additions & 4 deletions include/boost/archive/iterators/base64_from_binary.hpp
View file
Expand Up @@ -25,8 +25,6 @@ namespace std{
} // namespace std
#endif

#include <boost/serialization/pfto.hpp>

#include <boost/iterator/transform_iterator.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>

Expand Down Expand Up @@ -88,9 +86,9 @@ class base64_from_binary :
public:
// make composible buy using templated constructor
template<class T>
base64_from_binary(BOOST_PFTO_WRAPPER(T) start) :
base64_from_binary(T start) :
super_t(
Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start))),
Base(static_cast< T >(start)),
detail::from_6_bit<CharType>()
)
{}
Expand Down
5 changes: 2 additions & 3 deletions include/boost/archive/iterators/binary_from_base64.hpp
View file
Expand Up @@ -19,7 +19,6 @@
#include <boost/assert.hpp>

#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/pfto.hpp>
#include <boost/static_assert.hpp>

#include <boost/iterator/transform_iterator.hpp>
Expand Down Expand Up @@ -96,9 +95,9 @@ class binary_from_base64 : public
public:
// make composible buy using templated constructor
template<class T>
binary_from_base64(BOOST_PFTO_WRAPPER(T) start) :
binary_from_base64(T start) :
super_t(
Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start))),
Base(static_cast< T >(start)),
detail::to_6_bit<CharType>()
)
{}
Expand Down
6 changes: 2 additions & 4 deletions include/boost/archive/iterators/insert_linebreaks.hpp
View file
Expand Up @@ -23,8 +23,6 @@
namespace std{ using ::memcpy; }
#endif

#include <boost/serialization/pfto.hpp>

#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/iterator_traits.hpp>

Expand Down Expand Up @@ -83,8 +81,8 @@ class insert_linebreaks :
public:
// make composible buy using templated constructor
template<class T>
insert_linebreaks(BOOST_PFTO_WRAPPER(T) start) :
super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start)))),
insert_linebreaks(T start) :
super_t(Base(static_cast< T >(start))),
m_count(0)
{}
// intel 7.1 doesn't like default copy constructor
Expand Down
7 changes: 3 additions & 4 deletions include/boost/archive/iterators/mb_from_wchar.hpp
View file
Expand Up @@ -28,7 +28,6 @@ namespace std{
} // namespace std
#endif

#include <boost/serialization/pfto.hpp>
#include <boost/iterator/iterator_adaptor.hpp>

namespace boost {
Expand Down Expand Up @@ -86,7 +85,7 @@ class mb_from_wchar
wchar_t value = * this->base_reference();
#if (defined(__MINGW32__) && ((__MINGW32_MAJOR_VERSION > 3) \
|| ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 8))))
m_bend = std::wcrtomb(m_buffer, value, 0);
m_bend = std::wcrtomb(m_buffer, value,0);
#else
m_bend = std::wctomb(m_buffer, value);
#endif
Expand Down Expand Up @@ -114,8 +113,8 @@ class mb_from_wchar
public:
// make composible buy using templated constructor
template<class T>
mb_from_wchar(BOOST_PFTO_WRAPPER(T) start) :
super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start)))),
mb_from_wchar(T start) :
super_t(Base(static_cast< T >(start))),
m_bend(0),
m_bnext(0),
m_full(false)
Expand Down
6 changes: 2 additions & 4 deletions include/boost/archive/iterators/remove_whitespace.hpp
View file
Expand Up @@ -18,8 +18,6 @@

#include <boost/assert.hpp>

#include <boost/serialization/pfto.hpp>

#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/filter_iterator.hpp>
#include <boost/iterator/iterator_traits.hpp>
Expand Down Expand Up @@ -153,8 +151,8 @@ class remove_whitespace :
// remove_whitespace(){} // why is this needed?
// make composible buy using templated constructor
template<class T>
remove_whitespace(BOOST_PFTO_WRAPPER(T) start) :
super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start))))
remove_whitespace(T start) :
super_t(Base(static_cast< T >(start)))
{}
// intel 7.1 doesn't like default copy constructor
remove_whitespace(const remove_whitespace & rhs) :
Expand Down
6 changes: 2 additions & 4 deletions include/boost/archive/iterators/transform_width.hpp
View file
Expand Up @@ -24,8 +24,6 @@
// character and 8 bit bytes. Lowest common multiple is 24 => 4 6 bit characters
// or 3 8 bit characters

#include <boost/serialization/pfto.hpp>

#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/iterator_traits.hpp>

Expand Down Expand Up @@ -110,8 +108,8 @@ class transform_width :
public:
// make composible buy using templated constructor
template<class T>
transform_width(BOOST_PFTO_WRAPPER(T) start) :
super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start)))),
transform_width(T start) :
super_t(Base(static_cast< T >(start))),
m_buffer_out_full(false),
m_buffer_out(),
// To disable GCC warning, but not truly necessary
Expand Down
5 changes: 2 additions & 3 deletions include/boost/archive/iterators/wchar_from_mb.hpp
View file
Expand Up @@ -30,7 +30,6 @@ namespace std{
#endif

#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/pfto.hpp>

#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
Expand Down Expand Up @@ -89,8 +88,8 @@ class wchar_from_mb
public:
// make composible buy using templated constructor
template<class T>
wchar_from_mb(BOOST_PFTO_WRAPPER(T) start) :
super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start)))),
wchar_from_mb(T start) :
super_t(Base(static_cast< T >(start))),
m_full(false)
{}
// intel 7.1 doesn't like default copy constructor
Expand Down
5 changes: 2 additions & 3 deletions include/boost/archive/iterators/xml_escape.hpp
View file
Expand Up @@ -17,7 +17,6 @@
// See http://www.boost.org for updates, documentation, and revision history.

#include <boost/assert.hpp>
#include <boost/serialization/pfto.hpp>
#include <boost/archive/iterators/escape.hpp>

namespace boost {
Expand All @@ -40,8 +39,8 @@ class xml_escape
wchar_t fill(const wchar_t * & bstart, const wchar_t * & bend);

template<class T>
xml_escape(BOOST_PFTO_WRAPPER(T) start) :
super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start))))
xml_escape(T start) :
super_t(Base(static_cast< T >(start)))
{}
// intel 7.1 doesn't like default copy constructor
xml_escape(const xml_escape & rhs) :
Expand Down
5 changes: 2 additions & 3 deletions include/boost/archive/iterators/xml_unescape.hpp
View file
Expand Up @@ -19,7 +19,6 @@
#include <boost/assert.hpp>

#include <boost/serialization/throw_exception.hpp>
#include <boost/serialization/pfto.hpp>

#include <boost/archive/iterators/unescape.hpp>
#include <boost/archive/iterators/dataflow_exception.hpp>
Expand Down Expand Up @@ -54,8 +53,8 @@ class xml_unescape
value_type drain();

template<class T>
xml_unescape(BOOST_PFTO_WRAPPER(T) start) :
super_t(Base(BOOST_MAKE_PFTO_WRAPPER(static_cast< T >(start))))
xml_unescape(T start) :
super_t(Base(static_cast< T >(start)))
{}
// intel 7.1 doesn't like default copy constructor
xml_unescape(const xml_unescape & rhs) :
Expand Down
3 changes: 1 addition & 2 deletions include/boost/archive/polymorphic_iarchive.hpp
View file
Expand Up @@ -29,7 +29,6 @@ namespace std{

#include <boost/cstdint.hpp>

#include <boost/serialization/pfto.hpp>
#include <boost/archive/detail/iserializer.hpp>
#include <boost/archive/detail/interface_iarchive.hpp>
#include <boost/serialization/nvp.hpp>
Expand Down Expand Up @@ -102,7 +101,7 @@ class polymorphic_iarchive_impl :
// msvc and borland won't automatically pass these to the base class so
// make it explicit here
template<class T>
void load_override(T & t, BOOST_PFTO int)
void load_override(T & t)
{
archive::load(* this->This(), t);
}
Expand Down
3 changes: 1 addition & 2 deletions include/boost/archive/polymorphic_oarchive.hpp
View file
Expand Up @@ -28,7 +28,6 @@ namespace std{
#endif

#include <boost/cstdint.hpp>
#include <boost/serialization/pfto.hpp>
#include <boost/archive/detail/oserializer.hpp>
#include <boost/archive/detail/interface_oarchive.hpp>
#include <boost/serialization/nvp.hpp>
Expand Down Expand Up @@ -104,7 +103,7 @@ class polymorphic_oarchive_impl :
// msvc and borland won't automatically pass these to the base class so
// make it explicit here
template<class T>
void save_override(T & t, BOOST_PFTO int)
void save_override(T & t)
{
archive::save(* this->This(), t);
}
Expand Down
9 changes: 3 additions & 6 deletions include/boost/archive/text_iarchive.hpp
View file
Expand Up @@ -84,15 +84,12 @@ class text_iarchive_impl :
BOOST_ARCHIVE_DECL void
load(std::wstring &ws);
#endif
// note: the following should not needed - but one compiler (vc 7.1)
// fails to compile one test (test_shared_ptr) without it !!!
// make this protected so it can be called from a derived archive
template<class T>
void load_override(T & t, BOOST_PFTO int){
basic_text_iarchive<Archive>::load_override(t, 0);
void load_override(T & t){
basic_text_iarchive<Archive>::load_override(t);
}
BOOST_ARCHIVE_DECL void
load_override(class_name_type & t, int);
load_override(class_name_type & t);
BOOST_ARCHIVE_DECL void
init();
BOOST_ARCHIVE_DECL
Expand Down
6 changes: 2 additions & 4 deletions include/boost/archive/text_wiarchive.hpp
View file
Expand Up @@ -88,11 +88,9 @@ class text_wiarchive_impl :
BOOST_WARCHIVE_DECL void
load(std::wstring &ws);
#endif
// note: the following should not needed - but one compiler (vc 7.1)
// fails to compile one test (test_shared_ptr) without it !!!
template<class T>
void load_override(T & t, BOOST_PFTO int){
basic_text_iarchive<Archive>::load_override(t, 0);
void load_override(T & t){
basic_text_iarchive<Archive>::load_override(t);
}
BOOST_WARCHIVE_DECL
text_wiarchive_impl(std::wistream & is, unsigned int flags);
Expand Down
6 changes: 3 additions & 3 deletions include/boost/archive/xml_iarchive.hpp
View file
Expand Up @@ -99,11 +99,11 @@ class xml_iarchive_impl :
load(std::wstring &ws);
#endif
template<class T>
void load_override(T & t, BOOST_PFTO int){
basic_xml_iarchive<Archive>::load_override(t, 0);
void load_override(T & t){
basic_xml_iarchive<Archive>::load_override(t);
}
BOOST_ARCHIVE_DECL void
load_override(class_name_type & t, int);
load_override(class_name_type & t);
BOOST_ARCHIVE_DECL void
init();
BOOST_ARCHIVE_DECL
Expand Down
6 changes: 3 additions & 3 deletions include/boost/archive/xml_wiarchive.hpp
View file
Expand Up @@ -112,11 +112,11 @@ class xml_wiarchive_impl :
load(std::wstring &ws);
#endif
template<class T>
void load_override(T & t, BOOST_PFTO int){
basic_xml_iarchive<Archive>::load_override(t, 0);
void load_override(T & t){
basic_xml_iarchive<Archive>::load_override(t);
}
BOOST_WARCHIVE_DECL void
load_override(class_name_type & t, int);
load_override(class_name_type & t);
BOOST_WARCHIVE_DECL void
init();
BOOST_WARCHIVE_DECL
Expand Down
8 changes: 3 additions & 5 deletions include/boost/serialization/access.hpp
View file
Expand Up @@ -18,8 +18,6 @@

#include <boost/config.hpp>

#include <boost/serialization/pfto.hpp>

namespace boost {

namespace archive {
Expand Down Expand Up @@ -66,19 +64,19 @@ class access {
friend inline void serialize(
Archive & ar,
T & t,
const BOOST_PFTO unsigned int file_version
const unsigned int file_version
);
template<class Archive, class T>
friend inline void save_construct_data(
Archive & ar,
const T * t,
const BOOST_PFTO unsigned int file_version
const unsigned int file_version
);
template<class Archive, class T>
friend inline void load_construct_data(
Archive & ar,
T * t,
const BOOST_PFTO unsigned int file_version
const unsigned int file_version
);
#endif

Expand Down
8 changes: 4 additions & 4 deletions include/boost/serialization/detail/shared_count_132.hpp
View file
Expand Up @@ -188,12 +188,12 @@ class sp_counted_base

#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)

template<class T> void cbi_call_constructor_hook(sp_counted_base * pn, T * px, boost::checked_deleter< T > const &, int)
template<class T> void cbi_call_constructor_hook(sp_counted_base * pn, T * px, boost::checked_deleter< T > const &)
{
boost::sp_scalar_constructor_hook(px, sizeof(T), pn);
}

template<class T> void cbi_call_constructor_hook(sp_counted_base *, T * px, boost::checked_array_deleter< T > const &, int)
template<class T> void cbi_call_constructor_hook(sp_counted_base *, T * px, boost::checked_array_deleter< T > const &)
{
boost::sp_array_constructor_hook(px);
}
Expand All @@ -202,12 +202,12 @@ template<class P, class D> void cbi_call_constructor_hook(sp_counted_base *, P c
{
}

template<class T> void cbi_call_destructor_hook(sp_counted_base * pn, T * px, boost::checked_deleter< T > const &, int)
template<class T> void cbi_call_destructor_hook(sp_counted_base * pn, T * px, boost::checked_deleter< T > const &)
{
boost::sp_scalar_destructor_hook(px, sizeof(T), pn);
}

template<class T> void cbi_call_destructor_hook(sp_counted_base *, T * px, boost::checked_array_deleter< T > const &, int)
template<class T> void cbi_call_destructor_hook(sp_counted_base *, T * px, boost::checked_array_deleter< T > const &)
{
boost::sp_array_destructor_hook(px);
}
Expand Down
78 changes: 0 additions & 78 deletions include/boost/serialization/pfto.hpp
View file

This file was deleted.

7 changes: 3 additions & 4 deletions include/boost/serialization/serialization.hpp
View file
Expand Up @@ -12,7 +12,6 @@

#include <boost/config.hpp>
#include <boost/serialization/strong_typedef.hpp>
#include <boost/serialization/pfto.hpp>

/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
// serialization.hpp: interface for serialization system.
Expand Down Expand Up @@ -64,7 +63,7 @@ BOOST_STRONG_TYPEDEF(unsigned int, version_type)
// default implementation - call the member function "serialize"
template<class Archive, class T>
inline void serialize(
Archive & ar, T & t, const BOOST_PFTO unsigned int file_version
Archive & ar, T & t, const unsigned int file_version
){
access::serialize(ar, t, static_cast<unsigned int>(file_version));
}
Expand All @@ -74,7 +73,7 @@ template<class Archive, class T>
inline void save_construct_data(
Archive & /*ar*/,
const T * /*t*/,
const BOOST_PFTO unsigned int /*file_version */
const unsigned int /*file_version */
){
// default is to save no data because default constructor
// requires no arguments.
Expand All @@ -85,7 +84,7 @@ template<class Archive, class T>
inline void load_construct_data(
Archive & /*ar*/,
T * t,
const BOOST_PFTO unsigned int /*file_version*/
const unsigned int /*file_version*/
){
// default just uses the default constructor. going
// through access permits usage of otherwise private default
Expand Down
2 changes: 1 addition & 1 deletion include/boost/serialization/shared_ptr_132.hpp
View file
Expand Up @@ -78,7 +78,7 @@ inline void save_construct_data(
Archive & ar,
const
boost_132::detail::sp_counted_base_impl<P, D> *t,
const BOOST_PFTO unsigned int /* file_version */
const unsigned int /* file_version */
){
// variables used for construction
ar << boost::serialization::make_nvp("ptr", t->ptr);
Expand Down
1 change: 0 additions & 1 deletion src/basic_xml_grammar.ipp
View file
Expand Up @@ -33,7 +33,6 @@
// for head_iterator test
//#include <boost/bind.hpp>
#include <boost/function.hpp>
#include <boost/serialization/pfto.hpp>

#include <boost/io/ios_state.hpp>
#include <boost/serialization/throw_exception.hpp>
Expand Down
24 changes: 12 additions & 12 deletions test/test_iterators.cpp
View file
Expand Up @@ -42,8 +42,8 @@ void test_wchar_from_mb(const wchar_t *la, const char * a, const unsigned int si
typedef boost::archive::iterators::wchar_from_mb<const char *> translator;
BOOST_CHECK((
std::equal(
translator(BOOST_MAKE_PFTO_WRAPPER(a)),
translator(BOOST_MAKE_PFTO_WRAPPER(a + size)),
translator(a),
translator(a + size),
la
)
));
Expand All @@ -53,8 +53,8 @@ void test_mb_from_wchar(const char * a, const wchar_t *la, const unsigned int si
typedef boost::archive::iterators::mb_from_wchar<const wchar_t *> translator;
BOOST_CHECK(
std::equal(
translator(BOOST_MAKE_PFTO_WRAPPER(la)),
translator(BOOST_MAKE_PFTO_WRAPPER(la + size)),
translator(la),
translator(la + size),
a
)
);
Expand All @@ -72,8 +72,8 @@ void test_xml_escape(

BOOST_CHECK(
std::equal(
translator(BOOST_MAKE_PFTO_WRAPPER(xml)),
translator(BOOST_MAKE_PFTO_WRAPPER(xml + size)),
translator(xml),
translator(xml + size),
xml_escaped
)
);
Expand All @@ -91,8 +91,8 @@ void test_xml_unescape(

BOOST_CHECK(
std::equal(
translator(BOOST_MAKE_PFTO_WRAPPER(xml_escaped)),
translator(BOOST_MAKE_PFTO_WRAPPER(xml_escaped + size)),
translator(xml_escaped),
translator(xml_escaped + size),
xml
)
);
Expand All @@ -115,8 +115,8 @@ void test_transform_width(unsigned int size){
std::vector<char> vout;

std::copy(
translator1(BOOST_MAKE_PFTO_WRAPPER(static_cast<char *>(rawdata))),
translator1(BOOST_MAKE_PFTO_WRAPPER(rawdata + size)),
translator1(static_cast<char *>(rawdata)),
translator1(rawdata + size),
std::back_inserter(vout)
);

Expand All @@ -132,8 +132,8 @@ void test_transform_width(unsigned int size){

std::vector<char> vin;
std::copy(
translator2(BOOST_MAKE_PFTO_WRAPPER(vout.begin())),
translator2(BOOST_MAKE_PFTO_WRAPPER(vout.end())),
translator2(vout.begin()),
translator2(vout.end()),
std::back_inserter(vin)
);

Expand Down
8 changes: 3 additions & 5 deletions test/test_iterators_base64.cpp
View file
Expand Up @@ -24,8 +24,6 @@ namespace std{
}
#endif

#include <boost/serialization/pfto.hpp>

#include <boost/archive/iterators/binary_from_base64.hpp>
#include <boost/archive/iterators/base64_from_binary.hpp>
#include <boost/archive/iterators/insert_linebreaks.hpp>
Expand Down Expand Up @@ -61,8 +59,8 @@ void test_base64(unsigned int size){
translate_out;

std::copy(
translate_out(BOOST_MAKE_PFTO_WRAPPER(static_cast<CharType *>(rawdata))),
translate_out(BOOST_MAKE_PFTO_WRAPPER(rawdata + size)),
translate_out(static_cast<CharType *>(rawdata)),
translate_out(rawdata + size),
std::back_inserter(text_base64)
);

Expand All @@ -82,7 +80,7 @@ void test_base64(unsigned int size){
std::equal(
rawdata,
rawdata + size,
translate_in(BOOST_MAKE_PFTO_WRAPPER(text_base64.begin()))
translate_in(text_base64.begin())
)
);

Expand Down
2 changes: 1 addition & 1 deletion test/test_non_default_ctor.cpp
View file
Expand Up @@ -128,7 +128,7 @@ template<class Archive>
inline void save_construct_data(
Archive & ar,
const A * a,
const BOOST_PFTO unsigned int /* file_version */
const unsigned int /* file_version */
){
// variable used for construction
ar << boost::serialization::make_nvp("i", a->get_i());
Expand Down
2 changes: 1 addition & 1 deletion test/test_non_default_ctor2.cpp
View file
Expand Up @@ -99,7 +99,7 @@ template <class ArchiveT>
void save_construct_data(
ArchiveT& archive,
const A* p,
const BOOST_PFTO unsigned int /*version*/
const unsigned int /*version*/
){
archive & boost::serialization::make_nvp("initialValue", p->value);
}
Expand Down