Major merge from 'dev'

- BronsonAVLTreeMap (testing not complete yet, memory leaks is possible)
- Refactoring

diff --git a/build/build.sh b/build/build.sh
old mode 100755 (executable)
new mode 100644 (file)
index 01c8ada..5d5b249
--- a/build/build.sh
+++ b/build/build.sh
@@ -453,7 +453,7 @@ cxx_debug_options="-D_DEBUG -O0 -g $cxx_debug_options"
 cxx_release_options="-DNDEBUG $cxx_release_optimization $cxx_release_options"
 
 
-if test '$BOOST_INCLUDE_PATH' != ''; then
+if test 'x$BOOST_INCLUDE_PATH' != 'x'; then
        buildCXXflags="$buildCXXflags -I$BOOST_INCLUDE_PATH"
 fi
 
@@ -598,4 +598,4 @@ if test $MAKE_DEBUG_TEST = '1'; then
         $target \
      || exit $?
 fi   
- 
\ No newline at end of file
+