Changeset 15188


Ignore:
Timestamp:
03/30/13 12:20:19 (9 years ago)
Author:
tbretz
Message:
Fixed some compilation issues with older boost version as installed on gate.
Location:
trunk/FACT++/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/StateMachineDimControl.cc

    r15147 r15188  
    550550    //     fVerbosity = 90;
    551551
    552     const boost::filesystem::path path(conf.GetName());
    553     const string fname = path.filename().string();
     552#if BOOST_VERSION < 104600
     553    const string fname = boost::filesystem::path(conf.GetName()).filename();
     554#else
     555    const string fname = boost::filesystem::path(conf.GetName()).filename().string();
     556#endif
    554557
    555558    if (fname=="dimserver")
  • trunk/FACT++/src/dimctrl.cc

    r15111 r15188  
    11#include "StateMachineDimControl.h"
     2
    23#include "RemoteControl.h"
    34
     
    89#include "Main.h"
    910
     11namespace fs = boost::filesystem;
     12
    1013template<class T>
    1114int RunShell(Configuration &conf)
    1215{
    13     const boost::filesystem::path path(conf.GetName());
    14     const string fname = path.filename().string();
     16#if BOOST_VERSION < 104600
     17    const string fname = fs::path(conf.GetName()).filename();
     18#else
     19    const string fname = fs::path(conf.GetName()).filename().string();
     20#endif
    1521
    1622    StateMachineDimControl::fIsServer = fname=="dimserver";
     
    2026void SetupConfiguration(Configuration &conf)
    2127{
    22     const boost::filesystem::path path(conf.GetName());
    23     const string fname = path.filename().string();
     28#if BOOST_VERSION < 104600
     29    const string fname = fs::path(conf.GetName()).filename();
     30#else
     31    const string fname = fs::path(conf.GetName()).filename().string();
     32#endif
    2433
    2534    po::options_description control("Options ("+fname+")");
     
    108117        throw runtime_error("--force-console must be used with --console/-c");
    109118
    110     const boost::filesystem::path path(conf.GetName());
    111     const string fname = path.filename().string();
     119#if BOOST_VERSION < 104600
     120    const string fname = fs::path(conf.GetName()).filename();
     121#else
     122    const string fname = fs::path(conf.GetName()).filename().string();
     123#endif
    112124
    113125    if (fname=="dimserver" && !conf.Get<bool>("force-console"))
Note: See TracChangeset for help on using the changeset viewer.