diff --git a/project/jni/boost/include/boost/detail/endian.hpp b/project/jni/boost/include/boost/detail/endian.hpp index a1e00292c..5e658a8db 100644 --- a/project/jni/boost/include/boost/detail/endian.hpp +++ b/project/jni/boost/include/boost/detail/endian.hpp @@ -31,7 +31,7 @@ // GNU libc offers the helpful header which defines // __BYTE_ORDER -#if defined (__GLIBC__) || defined(ANDROID) +#if defined (__GLIBC__) || defined(ANDROID) || defined(__ANDROID__) # include # if (__BYTE_ORDER == __LITTLE_ENDIAN) # define BOOST_LITTLE_ENDIAN diff --git a/project/jni/boost/include/boost/interprocess/detail/workaround.hpp b/project/jni/boost/include/boost/interprocess/detail/workaround.hpp index 057e92752..de64f522d 100644 --- a/project/jni/boost/include/boost/interprocess/detail/workaround.hpp +++ b/project/jni/boost/include/boost/interprocess/detail/workaround.hpp @@ -54,7 +54,7 @@ #endif //Check for XSI shared memory objects. They are available in nearly all UNIX platforms - #if !defined(__QNXNTO__) /*&& !defined(ANDROID)*/ + #if !defined(__QNXNTO__) && !defined(ANDROID) && !defined(__ANDROID__) #define BOOST_INTERPROCESS_XSI_SHARED_MEMORY_OBJECTS #endif 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 af0657fc5..d3615c119 100644 --- a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp @@ -16,10 +16,6 @@ #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 @@ -603,8 +599,7 @@ 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 = (header *)((void*)pool); + header *new_header = reinterpret_cast
(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 c5c66c5b7..95cd92fca 100644 --- a/project/jni/boost/include/boost/utility/addressof.hpp +++ b/project/jni/boost/include/boost/utility/addressof.hpp @@ -36,12 +36,9 @@ template struct addressof_impl { static inline T * f( T & v, long ) { - T *ptr; -/* return reinterpret_cast( - &const_cast(reinterpret_cast(v)));*/ - ptr = (T*)(&v); -// memcpy(&ptr, &v, sizeof(T*)); - return ptr; } + return reinterpret_cast( + &const_cast(reinterpret_cast(v))); + } static inline T * f( T * v, int ) { diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_chrono.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_chrono.a index 76c8a420f..d94b65fb3 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_chrono.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_chrono.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_date_time.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_date_time.a index 0d75f0e2d..487482552 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_date_time.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_date_time.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_filesystem.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_filesystem.a index b7b708c20..b21f96d7c 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_filesystem.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_filesystem.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_iostreams.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_iostreams.a index 126cf911b..f1cd1ab4b 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_iostreams.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_iostreams.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_locale.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_locale.a index 9323ba8fa..cc63b553b 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_locale.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_locale.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_program_options.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_program_options.a index d8e857108..5c2885e3c 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_program_options.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_program_options.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_regex.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_regex.a index ce1a00bda..e1886e670 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_regex.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_regex.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_signals.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_signals.a index f18ec1706..8841f3891 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_signals.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_signals.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_system.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_system.a index 8cc654c3a..efb5a918e 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_system.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_system.a differ diff --git a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_thread.a b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_thread.a index 7ba2094eb..03a38b2d5 100644 Binary files a/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_thread.a and b/project/jni/boost/lib/arm-linux-androideabi-4.6/libboost_thread.a differ diff --git a/project/jni/boost/src b/project/jni/boost/src index 82900d3d0..d3fa4e813 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit 82900d3d0e9638172f7d65d130ca75f810cefb48 +Subproject commit d3fa4e813c6c0e181d9efd207765f37e79bceddc