miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Boost libraries

Browse Source
This commit is contained in:
Sergii Pylypenko
2013-06-26 17:31:21 +03:00
parent cb4611925f
commit d62c91a533
2623 changed files with 177228 additions and 61242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
project/jni/boost/include/boost/serialization/detail/get_data.hpp
View File

@@ -19,11 +19,12 @@
#define STD std
#endif
#include <vector>
#include <valarray>
namespace boost { namespace serialization { namespace detail {
namespace boost {
namespace serialization {
namespace detail {
template <class T, class Allocator>
T* get_data(STD::vector<T,Allocator>& v)
@@ -37,7 +38,6 @@ T* get_data(STD::vector<T,Allocator> const & v)
return get_data(const_cast<STD::vector<T,Allocator>&>(v));
}
template <class T>
T* get_data(STD::valarray<T>& v)
{
@@ -50,6 +50,12 @@ const T* get_data(STD::valarray<T> const& v)
return get_data(const_cast<STD::valarray<T>&>(v));
}
} } } //namespace boost::serialization::detail
} // detail
} // serialization
} // boost
#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
#undef STD
#endif
#endif // BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP

2
project/jni/boost/include/boost/serialization/extended_type_info_no_rtti.hpp
View File

@@ -147,7 +147,7 @@ public:
}
virtual void destroy(void const * const p) const{
boost::serialization::access::destroy(
static_cast<T const * const>(p)
static_cast<T const *>(p)
);
//delete static_cast<T const * const>(p) ;
}

2
project/jni/boost/include/boost/serialization/extended_type_info_typeid.hpp
View File

@@ -131,7 +131,7 @@ public:
}
virtual void destroy(void const * const p) const {
boost::serialization::access::destroy(
static_cast<T const * const>(p)
static_cast<T const *>(p)
);
//delete static_cast<T const * const>(p);
}

2
project/jni/boost/include/boost/serialization/factory.hpp
View File

@@ -24,7 +24,7 @@
#include <boost/preprocessor/facilities/empty.hpp>
namespace std{
#if defined(__LIBCOMO__) || defined(__QNXNTO__)
#if defined(__LIBCOMO__)
using ::va_list;
#endif
} // namespace std

6
project/jni/boost/include/boost/serialization/force_include.hpp
View File

@@ -40,11 +40,11 @@
# if defined(__MWERKS__)
# define BOOST_DLLEXPORT __declspec(dllexport)
# elif defined(__GNUC__) && (__GNUC__ >= 3)
# define BOOST_USED __attribute__ ((used))
# define BOOST_USED __attribute__ ((__used__))
# elif defined(__IBMCPP__) && (__IBMCPP__ >= 1110)
# define BOOST_USED __attribute__ ((used))
# define BOOST_USED __attribute__ ((__used__))
# elif defined(__INTEL_COMPILER) && (BOOST_INTEL_CXX_VERSION >= 800)
# define BOOST_USED __attribute__ ((used))
# define BOOST_USED __attribute__ ((__used__))
# endif
#endif

6
project/jni/boost/include/boost/serialization/smart_cast.hpp
View File

@@ -56,6 +56,8 @@
#include <boost/mpl/not.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/serialization/throw_exception.hpp>
namespace boost {
namespace serialization {
namespace smart_cast_impl {
@@ -159,7 +161,7 @@ namespace smart_cast_impl {
static T cast(U * u){
T tmp = dynamic_cast< T >(u);
#ifndef NDEBUG
if ( tmp == 0 ) throw std::bad_cast();
if ( tmp == 0 ) throw_exception(std::bad_cast());
#endif
return tmp;
}
@@ -201,7 +203,7 @@ namespace smart_cast_impl {
static T cast(U * u){
T tmp = dynamic_cast< T >(u);
#ifndef NDEBUG
if ( tmp == 0 ) throw std::bad_cast();
if ( tmp == 0 ) throw_exception(std::bad_cast());
#endif
return tmp;
}

4
project/jni/boost/include/boost/serialization/valarray.hpp
View File

@@ -31,7 +31,8 @@
#define STD std
#endif
namespace boost { namespace serialization {
namespace boost {
namespace serialization {
/////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8
// valarray< T >
@@ -45,7 +46,6 @@ void save( Archive & ar, const STD::valarray<U> &t, const unsigned int /*file_ve
ar << make_array(detail::get_data(t), t.size());
}
template<class Archive, class U>
void load( Archive & ar, STD::valarray<U> &t, const unsigned int /*file_version*/ )
{

9
project/jni/boost/include/boost/serialization/vector.hpp
View File

@@ -35,6 +35,14 @@
#define BOOST_SERIALIZATION_VECTOR_VERSIONED(V) (V==4 || V==5)
#endif
// function specializations must be defined in the appropriate
// namespace - boost::serialization
#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
#define STD _STLP_STD
#else
#define STD std
#endif
namespace boost {
namespace serialization {
@@ -207,5 +215,6 @@ inline void serialize(
#include <boost/serialization/collection_traits.hpp>
BOOST_SERIALIZATION_COLLECTION_TRAITS(std::vector)
#undef STD
#endif // BOOST_SERIALIZATION_VECTOR_HPP

2
project/jni/boost/include/boost/serialization/vector_135.hpp
View File

@@ -18,7 +18,7 @@
#error Boost.Serialization cannot be compatible with both 1.35 and 1.36-1.40 files
#endif
#else
#define BOOST_SERIALIZATION_VECTOR_VERSIONED(V) (V==4)
#define BOOST_SERIALIZATION_VECTOR_VERSIONED(V) (V>4)
#endif
#include <boost/serialization/vector.hpp>