Commit 0d87c972 authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Fixed bug #89653: Gaudi is not ready for Boost 1.48 (filesystem V3)

(in GaudiKernel)

https://savannah.cern.ch/bugs/index.php?89653

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: svn+ssh://svn.cern.ch/reps/gaudi/Gaudi/trunk@6709 53ecefc3-a64d-0410-9bdf-b8581fa3287e
parent d07a6cc8
Package : GaudiKernel
Package manager : Marco Clemencic
! 2011-12-07 - Marco Clemencic
- Fixed bug #89653: Gaudi is not ready for Boost 1.48 (filesystem V3)
! 2011-12-01 - Chris Jones
- Fixed bug #85377: GaudiTuple tuple does not undestand ulonglong
Add support for long long and unsigned long long data types
......
......@@ -66,7 +66,7 @@ bool DirSearchPath::find(const string& fileName, string& fullFileName) const {
try {
path fileFound;
if ( (rc = find(path(fileName), fileFound)) )
fullFileName = fileFound.native_directory_string();
fullFileName = fileFound.string();
} catch (...) {}
return rc;
}
......
......@@ -56,7 +56,7 @@ PR_find( const bf::path& file, const string& search_list,
try {
if ( ( file_type == PR_regular_file && is_regular_file( file ) ) ||
( file_type == PR_directory && is_directory( file ) ) ) {
result = bf::complete(file).string();
result = bf::system_complete(file).string();
return true;
}
} catch (bf::filesystem_error /*err*/) {
......@@ -68,7 +68,7 @@ PR_find( const bf::path& file, const string& search_list,
bf::path local = bf::initial_path() / file;
if ( ( file_type == PR_regular_file && is_regular_file( local ) ) ||
( file_type == PR_directory && is_directory( local ) ) ) {
result = bf::complete(file).string();
result = bf::system_complete(file).string();
return true;
}
} catch (bf::filesystem_error /*err*/) {
......@@ -86,7 +86,7 @@ PR_find( const bf::path& file, const string& search_list,
try {
if ( ( file_type == PR_regular_file && is_regular_file( fp ) ) ||
( file_type == PR_directory && is_directory( fp ) ) ) {
result = bf::complete(fp).string();
result = bf::system_complete(fp).string();
return true;
}
} catch (bf::filesystem_error /*err*/) {
......@@ -108,7 +108,7 @@ PR_find( const bf::path& file, const string& search_list,
bf::path fp2 = bf::path(*ritr) / file;
if ( ( file_type == PR_regular_file && is_regular_file( fp2 ) ) ||
( file_type == PR_directory && is_directory( fp2 ) ) ) {
result = bf::complete( fp2 ).string();
result = bf::system_complete( fp2 ).string();
return true;
}
}
......
......@@ -201,7 +201,6 @@ int createAppMgr();
int main ( int argc, char** argv )
//-----------------------------------------------------------------------------
{
fs::path::default_name_check(fs::native);
fs::path pwd = fs::initial_path();
fs::path out;
Strings_t libs;
......@@ -278,8 +277,7 @@ int main ( int argc, char** argv )
// try to read configuration from the optionally given configuration file
if( vm.count("input-cfg") ) {
string cfgFileName = vm["input-cfg"].as<string>();
cfgFileName = fs::complete( fs::path( cfgFileName,
fs::native ) ).string();
cfgFileName = fs::system_complete( fs::path( cfgFileName ) ).string();
std::ifstream ifs( cfgFileName.c_str() );
po::store( parse_config_file( ifs, config_file_options ), vm );
}
......@@ -324,8 +322,7 @@ int main ( int argc, char** argv )
for ( Strings_t::const_iterator iLib = inputLibs.begin();
iLib != inputLibs.end();
++iLib ) {
fs::path libPath = fs::path( *iLib, fs::native );
std::string lib = libPath.leaf().substr(0, libPath.leaf().find('.') );
std::string lib = fs::path(*iLib).stem().string();
if ( 0 == lib.find("lib") ) {
lib = lib.substr(3); // For *NIX remove "lib"
}
......@@ -351,8 +348,7 @@ int main ( int argc, char** argv )
}
if( vm.count("output-dir") ) {
out = fs::complete( fs::path( vm["output-dir"].as<string>(),
fs::native ) );
out = fs::system_complete( fs::path( vm["output-dir"].as<string>() ) );
}
if ( vm.count("debug-level") ) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment