#3082 BBTK Bug New Normal - not compiling in CentOS 2.6

[bbtk.git] / kernel / appli / bbpConfigurator / bbpConfigurator.cpp

diff --git a/kernel/appli/bbpConfigurator/bbpConfigurator.cpp b/kernel/appli/bbpConfigurator/bbpConfigurator.cpp
index 4de87c8161b0cf4d3611f2f4752842e1eb65b256..381ae326cc84917293574b9a41556181f9421359 100644 (file)
--- a/kernel/appli/bbpConfigurator/bbpConfigurator.cpp
+++ b/kernel/appli/bbpConfigurator/bbpConfigurator.cpp
@@ -251,7 +251,13 @@ int main(int argc, char **argv)
       {
         if(priorities[j] == i)
         {
+//EED 2017-03-28
+#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41 
+          out << "include " << package_name << "/boxes/" << files[j].filename() << std::endl;
+#else
           out << "include " << package_name << "/boxes/" << files[j].filename().string() << std::endl;
+#endif
+
           out << "#-----------------------------------------" << std::endl;
         }
       }
@@ -339,11 +345,17 @@ std::vector<bf::path> getFileList(const std::string& path)
   if(bf::exists(pth) && bf::is_directory(pth))
   {
     bf::directory_iterator end_itr;
-    for(bf::directory_iterator itr(pth); itr != end_itr; ++itr)
+    bf::directory_iterator itr(pth);
+    for(itr; itr != end_itr; ++itr)
     {
       if(!is_directory(itr->status()))
       {
+//EED 2017-03-28
+#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41 
+        std::string nm(itr->path().filename());
+#else
         std::string nm(itr->path().filename().string());
+#endif
         if(nm.substr(nm.size()-4) == ".bbs")
         {
           //std::cout << itr->path().filename().string() << std::endl;
@@ -361,7 +373,14 @@ std::vector<bf::path> getFileList(const std::string& path)
   // Order files by name
   for (int i = 0; i < (int)files.size()-1; ++i) {
     for (int j = i+1; j < (int)files.size(); ++j) {
+
+//EED 2017-03-28
+#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41 
+      if(files[j].filename() < files[i].filename())
+#else
       if(files[j].filename().string() < files[i].filename().string())
+#endif
+
       {
         bf::path tmp = files[i];
         files[i] = files[j];