feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

[msvc] remove MP_UNITS_CONSTRAINED_AUTO_WORKAROUND

Browse Source
This commit is contained in:
Jonas Hoppe
2024-09-04 10:19:15 +02:00
parent b05b3796ce
commit 8be458b0b7
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/include/mp-units/bits/hacks.h
+1 -4
View File
@@ -76,7 +76,6 @@
#if !defined MP_UNITS_HOSTED && defined __STDC_HOSTED__
#define MP_UNITS_HOSTED __STDC_HOSTED__
#endif
#if MP_UNITS_COMP_GCC
#define MP_UNITS_REMOVE_CONST(expr) std::remove_const_t<expr>
@@ -112,7 +111,6 @@ inline constexpr from_range_t from_range{};
#if MP_UNITS_COMP_MSVC
#define MP_UNITS_CONSTRAINED_AUTO_WORKAROUND(X)
#define MP_UNITS_CONSTRAINED_NTTP_WORKAROUND(X)
#define MP_UNITS_EXPRESSION_WORKAROUND(x) (x)
#define MP_UNITS_IS_VALUE_WORKAROUND(x) (x)
@@ -121,8 +119,7 @@ inline constexpr from_range_t from_range{};
#else
#define MP_UNITS_CONSTRAINED_AUTO_WORKAROUND(X) X
#define MP_UNITS_CONSTRAINED_NTTP_WORKAROUND(X) X'
#define MP_UNITS_CONSTRAINED_NTTP_WORKAROUND(X) X
#define MP_UNITS_EXPRESSION_WORKAROUND(x) x
#define MP_UNITS_IS_VALUE_WORKAROUND(x) x
#define MP_UNITS_IS_CONST_EXPR_WORKAROUND(x) x
src/core/include/mp-units/framework/unit.h
+1 -1
View File
@@ -220,7 +220,7 @@ struct propagate_point_origin<U, true> {
template<Magnitude auto M, Unit U>
struct scaled_unit_impl : detail::unit_interface, detail::propagate_point_origin<U> {
using _base_type_ = scaled_unit_impl; // exposition only
static constexpr MP_UNITS_CONSTRAINED_AUTO_WORKAROUND(Magnitude) auto mag = M;
static constexpr Magnitude auto mag = M;
static constexpr U reference_unit{};
};