diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index bb4c03227..a13813de8 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit bb4c032273153b5746f62de4308b9b9b8144c30e +Subproject commit a13813de8c296b918f3be671e15ae8f643753aae 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 f831fe261..2c3075a1d 100644 --- a/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp +++ b/project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp @@ -601,7 +601,7 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml char *pool = align(raw_memory); header *new_header; - memcpy( (void*) new_header, (void*)pool,sizeof(header*)); + memcpy( (void*) (&new_header), (void*) (&pool), sizeof(header*)); //header *new_header = reinterpret_cast
(pool); new_header->previous_begin = m_begin; diff --git a/project/jni/boost/include/boost/utility/addressof.hpp b/project/jni/boost/include/boost/utility/addressof.hpp index 1488533e8..9bb2ce491 100644 --- a/project/jni/boost/include/boost/utility/addressof.hpp +++ b/project/jni/boost/include/boost/utility/addressof.hpp @@ -36,14 +36,16 @@ template struct addressof_impl { static inline T * f( T & v, long ) { - T* address; + /*T* address; + T* oldAdress = &v; - memcpy( (void*) address, (void*)&v,sizeof(T*)); + memcpy( (void*) &address, (void*)(&oldAdress), sizeof(T*));*/ /*return reinterpret_cast( &const_cast( reinterpret_cast(v) ) );*/ - return address; + //return address; + return &v; } static inline T * f( T * v, int )