miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Keen theme and patched boost a bit to make it work wit CG

Browse Source
This commit is contained in:
Gerhard Stein
2013-09-20 19:42:29 +02:00
parent 4447a982f5
commit 2eb39951d5
22 changed files with 66 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/boost/include/boost/property_tree/detail/ptree_implementation.hpp
View File

@@ -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());
}

10
project/jni/boost/include/boost/property_tree/detail/rapidxml.hpp
View File

@@ -16,6 +16,10 @@
#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
@@ -596,10 +600,14 @@ 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 = reinterpret_cast<header *>(pool);
header *new_header = (header *)((void*)pool);
new_header->previous_begin = m_begin;
m_begin = raw_memory;
m_ptr = pool + sizeof(header);

8
project/jni/boost/include/boost/utility/addressof.hpp
View File

@@ -36,8 +36,12 @@ template<class T> struct addressof_impl
{
static inline T * f( T & v, long )
{
return reinterpret_cast<T*>(
&const_cast<char&>(reinterpret_cast<const volatile char &>(v)));
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;
}
static inline T * f( T * v, int )