fix includes (and use curly braces for constructor calls in measurmen…

…t.cpp as per c++ core guidelines)
mpusz · Nov 12, 2024 · 4ef0210 · 4ef0210
1 parent 0c1971e
commit 4ef0210
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/example/measurement.cpp b/example/measurement.cpp
@@ -70,51 +70,51 @@ class measurement {
   [[nodiscard]] friend constexpr measurement operator+(const measurement& lhs, const measurement& rhs)
   {
     using namespace std;
-    return measurement{std::in_place, lhs.value() + rhs.value(), hypot(lhs.uncertainty(), rhs.uncertainty())};
+    return measurement{lhs.value() + rhs.value(), hypot(lhs.uncertainty(), rhs.uncertainty())};
   }
 
   [[nodiscard]] friend constexpr measurement operator-(const measurement& lhs, const measurement& rhs)
   {
     using namespace std;
-    return measurement{std::in_place, lhs.value() - rhs.value(), hypot(lhs.uncertainty(), rhs.uncertainty())};
+    return measurement{lhs.value() - rhs.value(), hypot(lhs.uncertainty(), rhs.uncertainty())};
   }
 
   [[nodiscard]] friend constexpr measurement operator*(const measurement& lhs, const measurement& rhs)
   {
     const auto val = lhs.value() * rhs.value();
     using namespace std;
-    return measurement(val, val * hypot(lhs.relative_uncertainty(), rhs.relative_uncertainty()));
+    return measurement{val, val * hypot(lhs.relative_uncertainty(), rhs.relative_uncertainty())};
   }
 
   [[nodiscard]] friend constexpr measurement operator*(const measurement& lhs, const value_type& value)
   {
     const auto val = lhs.value() * value;
-    return measurement(val, val * lhs.relative_uncertainty());
+    return measurement{val, val * lhs.relative_uncertainty()};
   }
 
   [[nodiscard]] friend constexpr measurement operator*(const value_type& value, const measurement& rhs)
   {
     const auto val = rhs.value() * value;
-    return measurement(val, val * rhs.relative_uncertainty());
+    return measurement{val, val * rhs.relative_uncertainty()};
   }
 
   [[nodiscard]] friend constexpr measurement operator/(const measurement& lhs, const measurement& rhs)
   {
     const auto val = lhs.value() / rhs.value();
     using namespace std;
-    return measurement(val, val * hypot(lhs.relative_uncertainty(), rhs.relative_uncertainty()));
+    return measurement{val, val * hypot(lhs.relative_uncertainty(), rhs.relative_uncertainty())};
   }
 
   [[nodiscard]] friend constexpr measurement operator/(const measurement& lhs, const value_type& value)
   {
     const auto val = lhs.value() / value;
-    return measurement(val, val * lhs.relative_uncertainty());
+    return measurement{val, val * lhs.relative_uncertainty()};
   }
 
   [[nodiscard]] friend constexpr measurement operator/(const value_type& value, const measurement& rhs)
   {
     const auto val = value / rhs.value();
-    return measurement(val, val * rhs.relative_uncertainty());
+    return measurement{val, val * rhs.relative_uncertainty()};
   }
 
   [[nodiscard]] constexpr auto operator<=>(const measurement&) const = default;
@@ -127,12 +127,6 @@ class measurement {
 private:
   value_type value_{};
   value_type uncertainty_{};
-
-  // NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
-  constexpr measurement(std::in_place_t, value_type val, value_type err) :
-      value_(std::move(val)), uncertainty_(std::move(err))
-  {
-  }
 };
 
 }  // namespace

diff --git a/src/core/include/mp-units/framework.h b/src/core/include/mp-units/framework.h
@@ -40,6 +40,7 @@
 #include <mp-units/framework/quantity_spec_concepts.h>
 #include <mp-units/framework/reference.h>
 #include <mp-units/framework/representation_concepts.h>
+#include <mp-units/framework/scaling.h>
 #include <mp-units/framework/symbol_text.h>
 #include <mp-units/framework/system_reference.h>
 #include <mp-units/framework/unit.h>