fix: ODR violations in C++ modules fixed for clang-18

2025-08-03 20:34:26 +02:00 · 2024-02-22 20:25:05 +01:00
parent c18788f3ad
commit 7aacf5a3bf
27 changed files with 71 additions and 13 deletions
--- a/src/systems/include/mp-units/systems/angular/math.h
+++ b/src/systems/include/mp-units/systems/angular/math.h
@@ -22,12 +22,14 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/bits/external/hacks.h>
 #include <mp-units/bits/value_cast.h>
 #include <mp-units/customization_points.h>
 #include <mp-units/quantity.h>
-#include <mp-units/systems/angular/units.h>
 #include <mp-units/unit.h>
+#endif
+#include <mp-units/systems/angular/units.h>

 // IWYU pragma: begin_exports
 #include <cmath>
--- a/src/systems/include/mp-units/systems/angular/units.h
+++ b/src/systems/include/mp-units/systems/angular/units.h
@@ -22,9 +22,11 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/dimension.h>
 #include <mp-units/quantity_spec.h>
 #include <mp-units/unit.h>
+#endif

 namespace mp_units::angular {

--- a/src/systems/include/mp-units/systems/cgs/cgs.h
+++ b/src/systems/include/mp-units/systems/cgs/cgs.h
@@ -22,8 +22,10 @@

 #pragma once

-#include <mp-units/systems/si/units.h>
+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/unit.h>
+#endif
+#include <mp-units/systems/si/units.h>

 namespace mp_units::cgs {

--- a/src/systems/include/mp-units/systems/hep/hep.h
+++ b/src/systems/include/mp-units/systems/hep/hep.h
@@ -22,8 +22,10 @@

 #pragma once

-#include <mp-units/systems/si/si.h>
+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/unit.h>
+#endif
+#include <mp-units/systems/si/si.h>

 template<>
 inline constexpr std::optional<std::intmax_t> mp_units::known_first_factor<334'524'384'739> = 334'524'384'739;
--- a/src/systems/include/mp-units/systems/iau/iau.h
+++ b/src/systems/include/mp-units/systems/iau/iau.h
@@ -22,9 +22,11 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
+#include <mp-units/unit.h>
+#endif
 #include <mp-units/systems/si/constants.h>
 #include <mp-units/systems/si/units.h>
-#include <mp-units/unit.h>

 namespace mp_units::iau {

--- a/src/systems/include/mp-units/systems/iec80000/binary_prefixes.h
+++ b/src/systems/include/mp-units/systems/iec80000/binary_prefixes.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/unit.h>
+#endif

 namespace mp_units::iec80000 {

--- a/src/systems/include/mp-units/systems/iec80000/quantities.h
+++ b/src/systems/include/mp-units/systems/iec80000/quantities.h
@@ -22,8 +22,10 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/dimension.h>
 #include <mp-units/quantity_spec.h>
+#endif
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>

--- a/src/systems/include/mp-units/systems/iec80000/units.h
+++ b/src/systems/include/mp-units/systems/iec80000/units.h
@@ -22,9 +22,11 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
+#include <mp-units/unit.h>
+#endif
 #include <mp-units/systems/iec80000/quantities.h>
 #include <mp-units/systems/si/units.h>
-#include <mp-units/unit.h>

 namespace mp_units::iec80000 {

--- a/src/systems/include/mp-units/systems/imperial/imperial.h
+++ b/src/systems/include/mp-units/systems/imperial/imperial.h
@@ -22,8 +22,10 @@

 #pragma once

-#include <mp-units/systems/international/international.h>
+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/unit.h>
+#endif
+#include <mp-units/systems/international/international.h>

 namespace mp_units::imperial {

--- a/src/systems/include/mp-units/systems/international/international.h
+++ b/src/systems/include/mp-units/systems/international/international.h
@@ -22,9 +22,11 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
+#include <mp-units/unit.h>
+#endif
 #include <mp-units/systems/si/constants.h>
 #include <mp-units/systems/si/units.h>
-#include <mp-units/unit.h>

 namespace mp_units::international {

--- a/src/systems/include/mp-units/systems/isq/atomic_and_nuclear_physics.h
+++ b/src/systems/include/mp-units/systems/isq/atomic_and_nuclear_physics.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity_spec.h>
+#endif
 #include <mp-units/systems/isq/si_quantities.h>

 namespace mp_units::isq {
--- a/src/systems/include/mp-units/systems/isq/base_quantities.h
+++ b/src/systems/include/mp-units/systems/isq/base_quantities.h
@@ -22,9 +22,11 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/dimension.h>
 #include <mp-units/quantity.h>
 #include <mp-units/quantity_spec.h>
+#endif

 namespace mp_units::isq {

--- a/src/systems/include/mp-units/systems/isq/electromagnetism.h
+++ b/src/systems/include/mp-units/systems/isq/electromagnetism.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity_spec.h>
+#endif
 #include <mp-units/systems/isq/base_quantities.h>
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
--- a/src/systems/include/mp-units/systems/isq/mechanics.h
+++ b/src/systems/include/mp-units/systems/isq/mechanics.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity_spec.h>
+#endif
 #include <mp-units/systems/isq/si_quantities.h>
 #include <mp-units/systems/isq/space_and_time.h>

--- a/src/systems/include/mp-units/systems/isq/si_quantities.h
+++ b/src/systems/include/mp-units/systems/isq/si_quantities.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity_spec.h>
+#endif
 #include <mp-units/systems/isq/base_quantities.h>

 namespace mp_units::isq {
--- a/src/systems/include/mp-units/systems/isq/space_and_time.h
+++ b/src/systems/include/mp-units/systems/isq/space_and_time.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity_spec.h>
+#endif
 #include <mp-units/systems/isq/si_quantities.h>

 namespace mp_units::isq {
--- a/src/systems/include/mp-units/systems/isq/thermodynamics.h
+++ b/src/systems/include/mp-units/systems/isq/thermodynamics.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity_spec.h>
+#endif
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/si_quantities.h>
 #include <mp-units/systems/isq/space_and_time.h>
--- a/src/systems/include/mp-units/systems/isq_angle/isq_angle.h
+++ b/src/systems/include/mp-units/systems/isq_angle/isq_angle.h
@@ -22,8 +22,10 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity_spec.h>
 #include <mp-units/reference.h>
+#endif
 #include <mp-units/systems/angular/angular.h>
 #include <mp-units/systems/isq/isq.h>

--- a/src/systems/include/mp-units/systems/natural/natural.h
+++ b/src/systems/include/mp-units/systems/natural/natural.h
@@ -22,11 +22,13 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/system_reference.h>
+#include <mp-units/unit.h>
+#endif
 #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/prefixes.h>
-#include <mp-units/unit.h>

 namespace mp_units::natural {

--- a/src/systems/include/mp-units/systems/si/chrono.h
+++ b/src/systems/include/mp-units/systems/si/chrono.h
@@ -22,12 +22,14 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/customization_points.h>
 #include <mp-units/quantity_point.h>
+#include <chrono>
+#endif
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/prefixes.h>
 #include <mp-units/systems/si/units.h>
-#include <chrono>

 namespace mp_units {

--- a/src/systems/include/mp-units/systems/si/constants.h
+++ b/src/systems/include/mp-units/systems/si/constants.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity.h>
+#endif
 #include <mp-units/systems/si/units.h>

 namespace mp_units::si {
--- a/src/systems/include/mp-units/systems/si/math.h
+++ b/src/systems/include/mp-units/systems/si/math.h
@@ -22,13 +22,15 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/bits/external/hacks.h>
 #include <mp-units/bits/value_cast.h>
 #include <mp-units/customization_points.h>
 #include <mp-units/quantity.h>
+#include <mp-units/unit.h>
+#endif
 #include <mp-units/systems/isq/space_and_time.h>
 #include <mp-units/systems/si/units.h>
-#include <mp-units/unit.h>

 // IWYU pragma: begin_exports
 #include <cmath>
--- a/src/systems/include/mp-units/systems/si/prefixes.h
+++ b/src/systems/include/mp-units/systems/si/prefixes.h
@@ -22,7 +22,9 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/unit.h>
+#endif

 namespace mp_units::si {

--- a/src/systems/include/mp-units/systems/si/units.h
+++ b/src/systems/include/mp-units/systems/si/units.h
@@ -22,10 +22,13 @@

 #pragma once

+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/quantity_point.h>
+#include <mp-units/unit.h>
+#endif
+// #include <mp-units/systems/isq/mechanics.h>
 #include <mp-units/systems/isq/si_quantities.h>
 #include <mp-units/systems/si/prefixes.h>
-#include <mp-units/unit.h>

 namespace mp_units {

@@ -55,17 +58,20 @@ inline constexpr struct radian : named_unit<"rad", metre / metre, kind_of<isq::a
 inline constexpr struct steradian : named_unit<"sr", square(metre) / square(metre), kind_of<isq::solid_angular_measure>> {} steradian;
 inline constexpr struct hertz : named_unit<"Hz", one / second, kind_of<isq::frequency>> {} hertz;
 inline constexpr struct newton : named_unit<"N", kilogram * metre / square(second)> {} newton;
+// inline constexpr struct newton : named_unit<"N", kilogram * metre / square(second), kind_of<isq::force>> {} newton;
 #ifdef pascal
 #pragma push_macro("pascal")
 #undef pascal
 #define MP_UNITS_REDEFINE_PASCAL
 #endif
 inline constexpr struct pascal : named_unit<"Pa", newton / square(metre)> {} pascal;
+// inline constexpr struct pascal : named_unit<"Pa", newton / square(metre), kind_of<isq::pressure>> {} pascal;
 #ifdef MP_UNITS_REDEFINE_PASCAL
 #pragma pop_macro("pascal")
 #undef MP_UNITS_REDEFINE_PASCAL
 #endif
 inline constexpr struct joule : named_unit<"J", newton * metre> {} joule;
+// inline constexpr struct joule : named_unit<"J", newton * metre, kind_of<isq::energy>> {} joule;
 inline constexpr struct watt : named_unit<"W", joule / second> {} watt;
 inline constexpr struct coulomb : named_unit<"C", ampere * second> {} coulomb;
 inline constexpr struct volt : named_unit<"V", watt / ampere> {} volt;
--- a/src/systems/include/mp-units/systems/typographic/typographic.h
+++ b/src/systems/include/mp-units/systems/typographic/typographic.h
@@ -22,8 +22,10 @@

 #pragma once

-#include <mp-units/systems/international/international.h>
+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/unit.h>
+#endif
+#include <mp-units/systems/international/international.h>

 namespace mp_units::typographic {

--- a/src/systems/include/mp-units/systems/usc/usc.h
+++ b/src/systems/include/mp-units/systems/usc/usc.h
@@ -22,8 +22,10 @@

 #pragma once

-#include <mp-units/systems/international/international.h>
+#ifndef MP_UNITS_IN_MODULE_INTERFACE
 #include <mp-units/unit.h>
+#endif
+#include <mp-units/systems/international/international.h>

 namespace mp_units::usc {

--- a/src/systems/mp-units-systems.cpp
+++ b/src/systems/mp-units-systems.cpp
@@ -9,6 +9,8 @@ export import mp_units.core;

 export
 {
+#define MP_UNITS_IN_MODULE_INTERFACE
+
 #include <mp-units/systems/angular/angular.h>
 #include <mp-units/systems/cgs/cgs.h>
 #include <mp-units/systems/hep/hep.h>