Skip to content
Snippets Groups Projects
Commit b9b8a064 authored by Andreas Rauschert's avatar Andreas Rauschert
Browse files

Merge branch 'bugfix/remove_global_using_namespace_units' into 'master'

Move using namespace units to namespace mantle_api

See merge request eclipse/simopenpass/scenario_api!22
parents 3d5452fc dc3e2f31
No related branches found
No related tags found
1 merge request!22Move using namespace units to namespace mantle_api
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include <tuple> #include <tuple>
using namespace units;
namespace units namespace units
{ {
UNIT_ADD(jerk, UNIT_ADD(jerk,
...@@ -58,6 +56,8 @@ UNIT_ADD_CATEGORY_TRAIT(jerk_acceleration) ...@@ -58,6 +56,8 @@ UNIT_ADD_CATEGORY_TRAIT(jerk_acceleration)
namespace mantle_api namespace mantle_api
{ {
using namespace units;
template <typename T> template <typename T>
struct SplineSegment struct SplineSegment
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment