yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3889
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2016-06-07 23:03:47 +0200
message:
  Use unordered_map only for Boost >= 1.56
modified:
  core/Body.hpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'core/Body.hpp'
--- core/Body.hpp	2016-06-07 18:48:04 +0000
+++ core/Body.hpp	2016-06-07 21:03:47 +0000
@@ -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 @@
 		// 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