Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 31, 2015, 6:11:53 PM (9 years ago)
Author:
landauf
Message:

merged branch cpp11 to cpp11_v2

Location:
code/branches/cpp11_v2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11_v2

  • code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc

    r10624 r10733  
    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                        }
  • code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h

    r9667 r10733  
    9393            }
    9494
     95            operator T*()
     96            {
     97                return object_;
     98            }
     99
    95100            T* object_;              //!< The object
    96101    };
Note: See TracChangeset for help on using the changeset viewer.