Anonymous avatar Anonymous committed 422d963

changes for Boost 1.48 (filesystem v3)

Comments (0)

Files changed (5)

GaudiSvc-18-13-24-branch/cmt/requirements

         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

GaudiSvc-18-13-24-branch/doc/release.notes

 Package: GaudiSvc
 Package manager : Marco Clemencic
 
+============================== GaudiSvc-18-13-24-01 =============================
+! 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)
+M       cmt/requirements
+M       src/PersistencySvc/SequentialOutputStream.cpp
+M       src/JobOptionsSvc/Parser.cpp
+M       src/JobOptionsSvc/ParserUtils.cpp
+
 ============================== GaudiSvc-18-13-24 =============================
 ! 2011-11-14 - Charles Leggett
 - HistorySvc: fix non-XML output

GaudiSvc-18-13-24-branch/src/JobOptionsSvc/Parser.cpp

   if(pos.fileName().length()>0){
     // Add current file directory to search path
     sp.insert(sp.begin(),
-              fs::path(pos.fileName(),fs::native).branch_path()
-              .native_directory_string());
+              fs::path(pos.fileName()).branch_path().string());
   }
   std::string fileToParse;
   ok = Gaudi::Parsers::Utils::searchFile(fileName,true,sp,fileToParse);

GaudiSvc-18-13-24-branch/src/JobOptionsSvc/ParserUtils.cpp

 {
 	std::string result;
   try {
-    fs::path givenPath(removeEnvironment(fileInput),fs::native);
+    fs::path givenPath(removeEnvironment(fileInput));
     //std::cout<<"Given path="<<givenPath.string()<<std::endl;
     fs::path currentPath = givenPath;
     std::vector<std::string> sdirs = dirs;
     if(addCurrent){
       sdirs.insert(sdirs.begin(), 
-                   fs::initial_path().native_directory_string());
+                   fs::initial_path().string());
     }
     std::vector<std::string>::const_iterator current = 
       sdirs.begin(),end=sdirs.end();
     while(1) {
       if(fs::exists(currentPath)) {
-        fileOutput = currentPath.native_directory_string();
+        fileOutput = currentPath.string();
         return StatusCode::SUCCESS;
       }
       if(current!=end) {
         std::string _n = *current;
-        currentPath = fs::path(_n, fs::native)/givenPath;
+        currentPath = fs::path(_n)/givenPath;
       }else{
         return StatusCode::FAILURE;
       }

GaudiSvc-18-13-24-branch/src/PersistencySvc/SequentialOutputStream.cpp

    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 ) ) {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.