From: Eduardo DAVILA <davila@CreaTools-CentOS.(none)>
Date: Sun, 19 Mar 2017 18:30:09 +0000 (+0100)
Subject: #3082 BBTK Bug New Normal  -  not compiling in CentOS 2.6
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=53a23e4f6a81c449329e11fc0f1f3c4e35ccce3c;p=bbtk.git

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

diff --git a/kernel/appli/bbpConfigurator/bbpConfigurator.cpp b/kernel/appli/bbpConfigurator/bbpConfigurator.cpp
index 381ae32..a4fa7ac 100644
--- a/kernel/appli/bbpConfigurator/bbpConfigurator.cpp
+++ b/kernel/appli/bbpConfigurator/bbpConfigurator.cpp
@@ -252,7 +252,7 @@ int main(int argc, char **argv)
         if(priorities[j] == i)
         {
 //EED 2017-03-28
-#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41 
+#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;
@@ -351,7 +351,7 @@ std::vector<bf::path> getFileList(const std::string& path)
       if(!is_directory(itr->status()))
       {
 //EED 2017-03-28
-#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41 
+#if BOOST_MAJOR_VERSION <= 1 && BOOST_MINOR_VERSION <=41 
         std::string nm(itr->path().filename());
 #else
         std::string nm(itr->path().filename().string());
@@ -375,7 +375,7 @@ std::vector<bf::path> getFileList(const std::string& path)
     for (int j = i+1; j < (int)files.size(); ++j) {
 
 //EED 2017-03-28
-#if BOOST_MAJOR_VERSION <= 1 || BOOST_MINOR_VERSION <=41 
+#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())