Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10441


Ignore:
Timestamp:
May 10, 2015, 11:00:01 PM (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11/cmake/CompilerConfigGCC.cmake

    r9686 r10441  
    6464ADD_COMPILER_FLAGS("-Os"                   MinSizeRel     CACHE)
    6565
     66# Introducing c++11
     67# Note: there is also 'std=gnu++11', but that might not be portable to windows
     68ADD_COMPILER_FLAGS("-std=c++0x" CACHE)
     69
    6670# CMake doesn't seem to set the PIC flags right on certain 64 bit systems
    6771IF(NOT MINGW AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
  • code/branches/cpp11/src/libraries/core/config/ConfigFile.cc

    r9559 r10441  
    3535
    3636#include <boost/filesystem.hpp>
     37
     38#include <iterator>
     39#include <algorithm>
    3740
    3841#include "util/Convert.h"
     
    9396                        try
    9497                        {
    95                             boost::filesystem::copy_file(defaultFilepath, filepath);
     98                            std::ifstream input(defaultFilepath.string().c_str(), std::ifstream::in | std::ifstream::binary);
     99                            std::ofstream output(filepath.string().c_str(), std::ofstream::out | std::ofstream::binary);
     100                            copy(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>(), std::ostream_iterator<char>(output));
    96101                            orxout(internal_info, context::config) << "Copied " << this->filename_ << " from the default config folder." << endl;
    97102                        }
Note: See TracChangeset for help on using the changeset viewer.