diff options
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/correlation-calibrator.hpp | 12 | ||||
| -rw-r--r-- | compat/macros1.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/compat/correlation-calibrator.hpp b/compat/correlation-calibrator.hpp index 2c9e1937..cc168fcd 100644 --- a/compat/correlation-calibrator.hpp +++ b/compat/correlation-calibrator.hpp @@ -33,14 +33,14 @@ static constexpr inline double yaw_spacing_in_degrees = 1.5; static constexpr inline double pitch_spacing_in_degrees = 1; static constexpr inline double roll_spacing_in_degrees = 1; -static constexpr inline unsigned yaw_nbuckets = 1+ 360./yaw_spacing_in_degrees; -static constexpr inline unsigned pitch_nbuckets = 1+ 360./pitch_spacing_in_degrees; -static constexpr inline unsigned roll_nbuckets = 1+ 360./roll_spacing_in_degrees; +static constexpr inline unsigned yaw_nbuckets = unsigned(1+ 360./yaw_spacing_in_degrees); +static constexpr inline unsigned pitch_nbuckets = unsigned(1+ 360./pitch_spacing_in_degrees); +static constexpr inline unsigned roll_nbuckets = unsigned(1+ 360./roll_spacing_in_degrees); static constexpr inline double translation_spacing = .25; -static constexpr inline unsigned x_nbuckets = 1+ (max[0]-min[0])/translation_spacing; -static constexpr inline unsigned y_nbuckets = 1+ (max[1]-min[1])/translation_spacing; -static constexpr inline unsigned z_nbuckets = 1+ (max[2]-min[2])/translation_spacing; +static constexpr inline unsigned x_nbuckets = unsigned(1+ (max[0]-min[0])/translation_spacing); +static constexpr inline unsigned y_nbuckets = unsigned(1+ (max[1]-min[1])/translation_spacing); +static constexpr inline unsigned z_nbuckets = unsigned(1+ (max[2]-min[2])/translation_spacing); using vec6 = Mat<double, 6, 1>; using mat66 = Mat<double, 6, 6>; diff --git a/compat/macros1.h b/compat/macros1.h index 56f8e978..4c2d1c1e 100644 --- a/compat/macros1.h +++ b/compat/macros1.h @@ -35,9 +35,9 @@ #endif #ifndef PP_EXPAND -# define PP_EXPAND(x) PP_EXPAND__2(x) -# define PP_EXPAND__2(x) PP_EXPAND__3(x) x -# define PP_EXPAND__3(x) x +# define PP_EXPAND(x) PP_EXPAND2(x) +# define PP_EXPAND2(x) PP_EXPAND3(x) x +# define PP_EXPAND3(x) x #endif #ifdef _MSC_VER |