Skip to content

Commit

Permalink
re added missing boost ublas vector
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25817 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
niklwors committed Apr 29, 2015
1 parent 55d8775 commit d61f402
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions SimulationRuntime/cpp/Include/Core/Modelica.h
Expand Up @@ -79,16 +79,17 @@ using namespace std;
#include <boost/weak_ptr.hpp>
#include <functional>
#include <boost/range/irange.hpp>
#if defined (__APPLE__) || defined (__APPLE_CC__)
//see: https://svn.boost.org/trac/boost/ticket/11207
#else
#define BOOST_UBLAS_SHALLOW_ARRAY_ADAPTOR
#include <boost/numeric/ublas/storage.hpp>
#include <boost/numeric/ublas/vector.hpp>
#include <boost/numeric/ublas/io.hpp>
#include <boost/numeric/ublas/matrix.hpp>
#include <boost/numeric/ublas/matrix_proxy.hpp>
#include <boost/numeric/ublas/matrix_sparse.hpp>

#if defined (__APPLE__) || defined (__APPLE_CC__)
//see: https://svn.boost.org/trac/boost/ticket/11207
#else
#include <boost/numeric/ublas/storage.hpp>
#endif
#include <boost/range/adaptor/map.hpp>
#include <boost/range/algorithm/copy.hpp>
Expand Down Expand Up @@ -133,12 +134,10 @@ namespace fs = boost::filesystem;
#endif
using boost::unordered_map;

#if defined (__APPLE__) || defined (__APPLE_CC__)
//see: https://svn.boost.org/trac/boost/ticket/11207
#else

namespace uBlas = boost::numeric::ublas;
using namespace boost::numeric;
#endif


using namespace boost::assign;
using boost::multi_array;
Expand Down

0 comments on commit d61f402

Please sign in to comment.