Changeset 10441

Timestamp:

May 10, 2015, 11:00:01 PM (10 years ago)

Author:

bknecht

Message:

Turned on c++11 flag in compiler and fixed a bug where boost couldn't handle it.

Location:

code/branches/cpp11

Files:

• cmake/CompilerConfigGCC.cmake (modified) (1 diff)
• src/libraries/core/config/ConfigFile.cc (modified) (2 diffs)

code/branches/cpp11/cmake/CompilerConfigGCC.cmake

@@ -64 +64 @@
 ADD_COMPILER_FLAGS("-Os"                   MinSizeRel     CACHE)
 
+# Introducing c++11
+# Note: there is also 'std=gnu++11', but that might not be portable to windows
+ADD_COMPILER_FLAGS("-std=c++0x" CACHE)
+
 # CMake doesn't seem to set the PIC flags right on certain 64 bit systems
 IF(NOT MINGW AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")

code/branches/cpp11/src/libraries/core/config/ConfigFile.cc

@@ -35 +35 @@
 
 #include <boost/filesystem.hpp>
+
+#include <iterator>
+#include <algorithm>
 
 #include "util/Convert.h"
@@ -93 +96 @@
                         try
                         {
-                            boost::filesystem::copy_file(defaultFilepath, filepath);
+                            std::ifstream input(defaultFilepath.string().c_str(), std::ifstream::in | std::ifstream::binary);
+                            std::ofstream output(filepath.string().c_str(), std::ofstream::out | std::ofstream::binary);
+                            copy(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>(), std::ostream_iterator<char>(output));
                             orxout(internal_info, context::config) << "Copied " << this->filename_ << " from the default config folder." << endl;
                         }