Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rémi Cailletaud
yade
Commits
1623313c
Commit
1623313c
authored
Jun 08, 2016
by
Anton Gladky
Browse files
Revert using unordered_map in Body.
parent
5ee2799c
Changes
1
Hide whitespace changes
Inline
Side-by-side
core/Body.hpp
View file @
1623313c
...
...
@@ -14,11 +14,6 @@
#include "State.hpp"
#include "Material.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>
#include <lib/multimethods/Indexable.hpp>
...
...
@@ -31,11 +26,7 @@ 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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment