forced c++11 abi on

hecl/CMakeLists.txt

@@ -3,7 +3,7 @@ project(hecl)
 set(HECL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "HECL include dir" FORCE)
 add_subdirectory(extern)
 include_directories(include ${LOG_VISOR_INCLUDE_DIR} ${ATHENA_INCLUDE_DIR})
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=1")
 add_subdirectory(lib)
 add_subdirectory(blender)
 add_subdirectory(driver)

hecl/driver/CMakeLists.txt

@@ -21,5 +21,5 @@ list(APPEND DATA_SPEC_LIBS
 target_link_libraries(hecl
     HECLDatabase
     "-Wl,-whole-archive" ${DATA_SPEC_LIBS} "-Wl,-no-whole-archive"
-    HECL  AthenaCore NOD LogVisor blowfish z lzo2 pthread
+    HECL AthenaCore NOD LogVisor blowfish z lzo2 pthread
 )

hecl/driver/ToolBase.hpp

@@ -77,10 +77,7 @@ private:
                     ++it;
                 }
                 if (counter == WRAP_INDENT)
-                {
-                    string.insert(it, WRAP_INDENT, _S(' '));
-                    it += WRAP_INDENT;
-                }
+                    it = string.insert(it, WRAP_INDENT, _S(' ')) + WRAP_INDENT;
                 if (it >= string.end())
                     return;
                 if (*it != _S('\n'))