Merge branch 'reorder_string_generation' of https://github.com/LLNL/u…

…nits into reorder_string_generation
LLNL · Aug 5, 2023 · 168b12d · 168b12d
2 parents d6f2a2f + 92f9b71
commit 168b12d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/test/test_unit_strings.cpp b/test/test_unit_strings.cpp
@@ -418,8 +418,10 @@ TEST(unitStrings, Hertz)
 
 TEST(unitStrings, singleBase)
 {
-    EXPECT_EQ(to_string(precise::kilo*precise::J/precise::mol), "kJ/mol");
-    EXPECT_EQ(to_string(precise::kilo*precise::J/precise::rad.pow(2)), "kJ/rad^2");
+    EXPECT_EQ(to_string(precise::kilo * precise::J / precise::mol), "kJ/mol");
+    EXPECT_EQ(
+        to_string(precise::kilo * precise::J / precise::rad.pow(2)),
+        "kJ/rad^2");
 }
 
 TEST(unitStrings, watthours)
@@ -1570,7 +1572,6 @@ TEST(defaultUnits, singleCharacter)
     EXPECT_EQ(precise::K, default_unit("\xC8"));
 }
 
-
 #ifdef ENABLE_UNIT_TESTING
 TEST(stringGeneration, test1)
 {

diff --git a/units/units.cpp b/units/units.cpp
@@ -1635,7 +1635,7 @@ static std::string
             return res;
         }
     }
-    
+
     if (allowUserDefinedUnits.load(std::memory_order_acquire)) {
         for (const auto& udu : user_defined_unit_names) {
             auto str = probeUnitBase(