Commit 93a5b4a0 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Upgrade boost to version 1.53.0 and clipper to 5.03

parent 42c2399a

include/boost/archive/archive_exception.hpp

+99 −97
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ namespace archive { 
class BOOST_ARCHIVE_DECL(BOOST_PP_EMPTY()) archive_exception : 

    public virtual std::exception

{

protected:

    char m_buffer[128];

public:

    typedef enum {

        no_exception,       // initialized without code
@@ -74,8 +76,6 @@ public: 
                            // type has been instantiated in more than one module.

        output_stream_error // error on input stream

    } exception_code;

protected:

    std::string m_msg;

public:

    exception_code code;

    archive_exception(
@@ -83,9 +83,11 @@ public: 
        const char * e1 = NULL,

        const char * e2 = NULL

    );

    ~archive_exception() throw ();

    virtual ~archive_exception() throw();

    virtual const char *what() const throw();

protected:

    unsigned int

    append(unsigned int l, const char * a);

    archive_exception();

};

include/boost/archive/basic_archive.hpp

+301 −300
Original line number Diff line number Diff line
@@ -150,7 +150,8 @@ private: 
    base_type t;

public:

    object_id_type(): t(0) {};

    explicit object_id_type(const unsigned int & t_) : t(t_){

    // note: presumes that size_t >= unsigned int.

    explicit object_id_type(const std::size_t & t_) : t(t_){

        BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);

    }

    object_id_type(const object_id_type & t_) :

include/boost/archive/detail/basic_serializer_map.hpp

+69 −69
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <set>



#include <boost/config.hpp>

#include <boost/utility.hpp>

#include <boost/noncopyable.hpp>

#include <boost/archive/detail/auto_link_archive.hpp>



#include <boost/archive/detail/abi_prefix.hpp> // must be the last header

include/boost/archive/detail/iserializer.hpp

+632 −632
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ namespace std{ 


#define DONT_USE_HAS_NEW_OPERATOR (                    \

    defined(__BORLANDC__)                              \

    || defined(__IBMCPP__)                             \

    || BOOST_WORKAROUND(__IBMCPP__, < 1210)            \

    || defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)     \

    || defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x590)   \

)

include/boost/archive/impl/basic_text_iprimitive.ipp

+152 −154
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ basic_text_iprimitive<IStream>::load_binary( 
        > 

        binary;

        

    binary ti_begin = binary(

    binary i = binary(

        BOOST_MAKE_PFTO_WRAPPER(

            iterators::istream_iterator<CharType>(is)

        )
@@ -96,13 +96,11 @@ basic_text_iprimitive<IStream>::load_binary( 
    char * caddr = static_cast<char *>(address);

    

    // take care that we don't increment anymore than necessary

    while(--count > 0){

        *caddr++ = static_cast<char>(*ti_begin);

        ++ti_begin;

    while(count-- > 0){

        *caddr++ = static_cast<char>(*i++);

    }

    *caddr++ = static_cast<char>(*ti_begin);



    iterators::istream_iterator<CharType> i;

    // skip over any excess input

    for(;;){

        BOOST_DEDUCED_TYPENAME IStream::int_type r;

        r = is.get();