Commit 46d3117f authored by Marco Clemencic's avatar Marco Clemencic
Browse files

Fixed bug #89653: Gaudi is not ready for Boost 1.48

(in GaudiSvc)
- fixed the usage of boost::filesystem
- removed the option -pedantic to avoid a problem with boost::spirit

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@6710 53ecefc3-a64d-0410-9bdf-b8581fa3287e
parent 0d87c972
......@@ -81,4 +81,9 @@ macro_append cppflags "" \
target-darwin "" \
target-winxp ""
# Boost Spirit (1.48) gives a compilation error (extra ';') when -pedantic is used
macro_remove cppflags "" \
no-hide-warnings "" \
target-linux "-pedantic"
apply_pattern QMTest
Package: GaudiSvc
Package manager : Marco Clemencic
! 2011-12-07 - Marco Clemencic
- Fixed bug #89653: Gaudi is not ready for Boost 1.48 (filesystem V3)
- Problem with Boost (1.48) Spirit: disabled to -pedantic option (temporarily)
============================== GaudiSvc v18r17 ===============================
! 2011-10-12 - Charles Leggett
- THistSvc: call Reset() on all TTrees and THNs in io_reinit when copying to
......
......@@ -68,10 +68,10 @@ void SequentialOutputStream::makeFilename()
if ( m_events % m_eventsPerFile != 0 ) return;
bf::path outputPath( m_outputName );
string filename = outputPath.filename();
string filename = outputPath.filename().string();
bf::path dir = outputPath.parent_path();
string stem = outputPath.stem();
string extension = outputPath.extension();
string stem = outputPath.stem().string();
string extension = outputPath.extension().string();
if ( !dir.empty() ) {
if ( !bf::exists( dir ) ) {
......@@ -80,14 +80,14 @@ void SequentialOutputStream::makeFilename()
throw GaudiException( stream.str(), "error", StatusCode::FAILURE );
}
}
if ( m_numericFilename ) {
if ( m_events == 0 ) {
try {
m_iFile = lexical_cast< unsigned int >( stem );
} catch( const bad_lexical_cast& /* cast */ ) {
stringstream stream;
stream << "Filename " << filename
stream << "Filename " << filename
<< " is not a number, which was needed.";
throw GaudiException( stream.str(), "error", StatusCode::FAILURE );
}
......
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