diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 799859db3..804018967 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 799859db334e51a6c7982855828a3596dd785ca0 +Subproject commit 80401896735c8b13eaf9a5e1c1d98581b2f78df5 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..f831fe261 100644 --- a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp @@ -599,7 +599,11 @@ 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; + memcpy( (void*) new_header, (void*)pool,sizeof(header*)); + + //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 95cd92fca..1488533e8 100644 --- a/project/jni/boost/include/boost/utility/addressof.hpp +++ b/project/jni/boost/include/boost/utility/addressof.hpp @@ -36,8 +36,14 @@ template struct addressof_impl { static inline T * f( T & v, long ) { - return reinterpret_cast( - &const_cast(reinterpret_cast(v))); + T* address; + + memcpy( (void*) address, (void*)&v,sizeof(T*)); + + /*return reinterpret_cast( + &const_cast( reinterpret_cast(v) ) + );*/ + return address; } static inline T * f( T * v, int ) diff --git a/project/jni/boost/src b/project/jni/boost/src index d3fa4e813..5824acb45 160000 --- a/project/jni/boost/src +++ b/project/jni/boost/src @@ -1 +1 @@ -Subproject commit d3fa4e813c6c0e181d9efd207765f37e79bceddc +Subproject commit 5824acb451e671205afeb188576be1dd9a2674bd diff --git a/project/jni/shmem b/project/jni/shmem index 89c7cb8d0..c2a28f528 160000 --- a/project/jni/shmem +++ b/project/jni/shmem @@ -1 +1 @@ -Subproject commit 89c7cb8d033412be4fdca551ec39432d5d2d06a6 +Subproject commit c2a28f528d0b1b2528dda125e8fe8018609e7e9a