Updated boost libraries

project/jni/boost/include/boost/detail/endian.hpp

@@ -31,7 +31,7 @@
 // GNU libc offers the helpful header <endian.h> which defines
 // __BYTE_ORDER
 
-#if defined (__GLIBC__) || defined(ANDROID)
+#if defined (__GLIBC__) || defined(ANDROID) || defined(__ANDROID__)
 # include <endian.h>
 # if (__BYTE_ORDER == __LITTLE_ENDIAN)
 #  define BOOST_LITTLE_ENDIAN

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
 

project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp

@@ -16,10 +16,6 @@
 #include <cstdlib>      // For std::size_t
 #include <new>          // For placement new
 
-#ifdef ANDROID
-#include <android/log.h>
-#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<header *>(pool);
-		header *new_header = (header *)((void*)pool);
+                header *new_header = reinterpret_cast<header *>(pool);
                 new_header->previous_begin = m_begin;
                 m_begin = raw_memory;
                 m_ptr = pool + sizeof(header);

project/jni/boost/include/boost/utility/addressof.hpp

@@ -36,12 +36,9 @@ template<class T> struct addressof_impl
 {
     static inline T * f( T & v, long )
     {
-	T *ptr;
-/*        return reinterpret_cast<T*>(
-            &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));*/
-	ptr = (T*)(&v);
-//	memcpy(&ptr, &v, sizeof(T*));
-	return ptr;    }
+        return reinterpret_cast<T*>(
+            &const_cast<char&>(reinterpret_cast<const volatile char &>(v)));
+    }
 
     static inline T * f( T * v, int )
     {