Commit 141fef0d authored by Anton Gladky's avatar Anton Gladky
Browse files

Use unordered_map only for Boost >= 1.56

parent 1494819b
......@@ -14,8 +14,10 @@
#include "State.hpp"
#include "Material.hpp"
#include <unordered_map>
#include <boost/serialization/unordered_map.hpp>
#if (BOOST_VERSION >= 105600)
#include <unordered_map>
#include <boost/serialization/unordered_map.hpp>
#endif
#include <lib/base/Math.hpp>
#include <lib/serialization/Serializable.hpp>
......@@ -29,7 +31,11 @@ class Body: public Serializable{
// numerical types for storing ids
using id_t = int ;
// internal structure to hold some interaction of a body; used by InteractionContainer;
#if (BOOST_VERSION >= 105600)
using MapId2IntrT = std::unordered_map<Body::id_t, shared_ptr<Interaction> >;
#else
using MapId2IntrT = std::map<Body::id_t, shared_ptr<Interaction> >;
#endif
// groupMask type
// bits for Body::flags
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment