-fixed error with boost::minmax for c++11 in msvc

OpenModelica · Oct 22, 2015 · 49554e7 · 49554e7
1 parent b99d59c
commit 49554e7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/SimulationRuntime/cpp/Include/Core/Modelica.h b/SimulationRuntime/cpp/Include/Core/Modelica.h
@@ -113,13 +113,15 @@ using std::runtime_error;
     #include <tuple>
     using std::tuple;
     using std::make_tuple;
+    using std::minmax_element;
   #else
     #include <boost/tuple/tuple.hpp>
+    #include <boost/algorithm/minmax_element.hpp>
     using boost::tuple;
     using boost::make_tuple;
+    using boost::minmax_element;
   #endif
   #include <boost/array.hpp>
-  #include <boost/algorithm/minmax_element.hpp>
   #include <boost/shared_ptr.hpp>
   #include <boost/weak_ptr.hpp>
 
@@ -140,7 +142,6 @@ using std::runtime_error;
   #endif //USE_THREAD
 
   using boost::array;
-  using boost::minmax_element;
   using boost::shared_ptr;
   using boost::weak_ptr;
   using boost::dynamic_pointer_cast;