Skip to content
Snippets Groups Projects
Commit bf53f32f authored by René Paris's avatar René Paris
Browse files

Merge branch 'rm-using-namespace-units' into 'master'

Rm "using namespace units" from spline.h

Closes #5

See merge request eclipse/simopenpass/scenario_api!67
parents f8bed7bd 382a5df1
No related branches found
No related tags found
No related merge requests found
...@@ -56,7 +56,6 @@ UNIT_ADD_CATEGORY_TRAIT(jerk_acceleration) ...@@ -56,7 +56,6 @@ 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
...@@ -67,7 +66,7 @@ struct SplineSegment ...@@ -67,7 +66,7 @@ struct SplineSegment
Vec3<T> d; Vec3<T> d;
}; };
template <typename T, class = typename std::enable_if_t<traits::is_unit<T>::value>> template <typename T, class = typename std::enable_if_t<units::traits::is_unit<T>::value>>
struct SplineSection struct SplineSection
{ {
Time start_time{0}; Time start_time{0};
...@@ -78,15 +77,15 @@ struct SplineSection ...@@ -78,15 +77,15 @@ struct SplineSection
/// \f[ /// \f[
/// P(x) = \sum_{i=0}^{3} a_{i} x^{i} = a_3 x^3 + a_2 x^2 + a_1 x + a_0 /// P(x) = \sum_{i=0}^{3} a_{i} x^{i} = a_3 x^3 + a_2 x^2 + a_1 x + a_0
/// \f] /// \f]
std::tuple<unit_t<compound_unit<T, inverse<cubed<time::second>>>>, std::tuple<units::unit_t<units::compound_unit<T, units::inverse<units::cubed<units::time::second>>>>,
unit_t<compound_unit<T, inverse<squared<time::second>>>>, units::unit_t<units::compound_unit<T, units::inverse<units::squared<units::time::second>>>>,
unit_t<compound_unit<T, inverse<time::second>>>, units::unit_t<units::compound_unit<T, units::inverse<units::time::second>>>,
unit_t<T>> units::unit_t<T>>
polynomial{ polynomial{
unit_t<compound_unit<T, inverse<cubed<time::second>>>>(0), units::unit_t<units::compound_unit<T, units::inverse<units::cubed<units::time::second>>>>(0),
unit_t<compound_unit<T, inverse<squared<time::second>>>>(0), units::unit_t<units::compound_unit<T, units::inverse<units::squared<units::time::second>>>>(0),
unit_t<compound_unit<T, inverse<time::second>>>(0), units::unit_t<units::compound_unit<T, units::inverse<units::time::second>>>(0),
unit_t<T>(0)}; units::unit_t<T>(0)};
}; };
/// @brief Equality comparison for SplineSection. /// @brief Equality comparison for SplineSection.
......
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