Updated boost and vcmi. Still not compilable but on it.

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

@@ -657,7 +657,7 @@ namespace boost { namespace property_tree
     template<class Type> inline
     Type basic_ptree<K, D, C>::get_value() const
     {
-	return get_value<Type>(
+        return get_value<Type>(
             typename translator_between<data_type, Type>::type());
     }
 

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
@@ -600,14 +596,10 @@ namespace boost { namespace property_tree { namespace detail {namespace rapidxml
                 // Allocate
                 std::size_t alloc_size = sizeof(header) + (2 * BOOST_PROPERTY_TREE_RAPIDXML_ALIGNMENT - 2) + pool_size;     // 2 alignments required in worst case: one for header, one for actual allocation
                 char *raw_memory = allocate_raw(alloc_size);
-
                     
                 // 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,8 @@ 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 )