#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 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];

diff --git a/packages/wx/src/bbwxComboBox.cxx b/packages/wx/src/bbwxComboBox.cxx
index 27e69d030aa4ca18d830fff1be81ffe5dc11b908..5b8ab4529fd67dc9d3f18f03cab898b5fd70eae2 100644 (file)
--- a/packages/wx/src/bbwxComboBox.cxx
+++ b/packages/wx/src/bbwxComboBox.cxx
@@ -25,7 +25,7 @@ namespace bbwx
                     std::vector< std::string > lstIn, 
                                        int typeForm );
        ~ComboBoxWidget();
-       void OnComboBox(int iSelection);
+       void OnComboBoxSelection(int iSelection);
        void OnComboBox(wxEvent& event);
        void FillItems( int iSelection, std::vector< std::string > lstIn);
 
@@ -108,7 +108,7 @@ namespace bbwx
 
 
   //--------------------------------------------------------------------------
-  void ComboBoxWidget::OnComboBox(int iSelection)
+  void ComboBoxWidget::OnComboBoxSelection(int iSelection)
   {
     mBox->bbSetInputSelection( iSelection );
     mBox->bbSetOutputOut( iSelection );
@@ -127,7 +127,7 @@ namespace bbwx
         } else {
                 iSelection = wxchoice->GetSelection();
         }
-        OnComboBox(iSelection);
+        OnComboBoxSelection(iSelection);
   }
 //--------------------------------------------------------------------------
   void ComboBoxWidget::FillItems(

diff --git a/packages/wx/src/bbwxLayoutTab.cxx b/packages/wx/src/bbwxLayoutTab.cxx
index cc2b2a7491a7b6349469e61532ad5e2e4435abf3..639281af23eb74860925699de05a7eb992397e93 100644 (file)
--- a/packages/wx/src/bbwxLayoutTab.cxx
+++ b/packages/wx/src/bbwxLayoutTab.cxx
@@ -114,7 +114,7 @@ namespace bbwx
        {
                        // Get black box from 
                        BlackBox::Pointer from = c->GetConnection()->GetBlackBoxFrom();
-                       WidgetBlackBox<wxWindow>::Pointer wfrom = boost::dynamic_pointer_cast<WidgetBlackBox<wxWindow> >(from);
+                       bbtk::WidgetBlackBox<wxWindow>::Pointer wfrom = boost::dynamic_pointer_cast<bbtk::WidgetBlackBox<wxWindow> >(from);
                        vecTitle.push_back( wfrom->bbGetInputWinTitle() );
                } // if c
        } // for iWidget