diff --git a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp index d3615c119..af0657fc5 100644 --- a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp @@ -16,6 +16,10 @@ #include // For std::size_t #include // For placement new +#ifdef ANDROID +#include +#endif + // On MSVC, disable "conditional expression is constant" warning (level 4). // This warning is almost impossible to avoid with certain types of templated code #ifdef _MSC_VER @@ -599,7 +603,8 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml // Setup new pool in allocated memory char *pool = align(raw_memory); - header *new_header = reinterpret_cast
(pool); + //header *new_header = reinterpret_cast
(pool); + header *new_header = (header *)((void*)pool); new_header->previous_begin = m_begin; m_begin = raw_memory; m_ptr = pool + sizeof(header); diff --git a/project/jni/boost/include/boost/utility/addressof.hpp b/project/jni/boost/include/boost/utility/addressof.hpp index 95cd92fca..f39bc180b 100644 --- a/project/jni/boost/include/boost/utility/addressof.hpp +++ b/project/jni/boost/include/boost/utility/addressof.hpp @@ -36,9 +36,12 @@ template struct addressof_impl { static inline T * f( T & v, long ) { - return reinterpret_cast( - &const_cast(reinterpret_cast(v))); - } +- T *ptr; +-/* return reinterpret_cast( +- &const_cast(reinterpret_cast(v)));*/ +- ptr = (T*)(&v); +-// memcpy(&ptr, &v, sizeof(T*)); +- return ptr; } static inline T * f( T * v, int ) {