fix cpplint issues

LLNL · Oct 17, 2024 · fbcb0f8 · fbcb0f8
1 parent 89a38e1
commit fbcb0f8
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 5 deletions.
diff --git a/converter/converter.cpp b/converter/converter.cpp
@@ -8,6 +8,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "CLI11.hpp"
 #include "units/units.hpp"
 #include <cstdio>
+#include <string>
 
 int main(int argc, char* argv[])
 {
@@ -42,10 +43,8 @@ int main(int argc, char* argv[])
            newUnits,
            "the units to convert the measurement to, '*' to convert to base units")
         ->required();
-    app.add_flag_callback("--version,-v", []() {
-        std::cout << "Units conversion " UNITS_VERSION_STRING << '\n';
-        throw CLI::Success();
-    });
+    app.set_version_flag("--version,-v","Units conversion " UNITS_VERSION_STRING);
+
     app.positionals_at_end();
 
     CLI11_PARSE(app, argc, argv);

diff --git a/test/fuzz_issue_tests.cpp b/test/fuzz_issue_tests.cpp
@@ -11,6 +11,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cstring>
 #include <fstream>
 #include <iostream>
+#include <vector>
+#include <string>
 
 using namespace units;
 TEST(fuzzFailures, convFailures)

diff --git a/test/test_all_unit_base.cpp b/test/test_all_unit_base.cpp
@@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units.hpp"
 
 #include <limits>
+#include <iostream>
 using namespace units;
 
 TEST(allUnits, all)

diff --git a/test/test_conversions2.cpp b/test/test_conversions2.cpp
@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <algorithm>
 #include <fstream>
 #include <vector>
+#include <string>
 
 // structure containing information on a single conversion
 struct convValue {

diff --git a/test/test_defined_units.cpp b/test/test_defined_units.cpp
@@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units_conversion_maps.hpp"
 #include <map>
 #include <unordered_map>
+#include <string>
 
 TEST(unitStringDefinitions, siVectorLength)
 {

diff --git a/test/test_equation_units.cpp b/test/test_equation_units.cpp
@@ -8,6 +8,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "test.hpp"
 #include "units/units.hpp"
 
+#include <vector>
+
 using namespace units;
 
 TEST(logUnits, nonEquality)

diff --git a/test/test_google_units.cpp b/test/test_google_units.cpp
@@ -12,6 +12,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <fstream>
 #include <ostream>
 #include <sstream>
+#include <string>
+#include <iostream>
 
 TEST(googleUnits, unitTypes)
 {

diff --git a/test/test_measurement_strings.cpp b/test/test_measurement_strings.cpp
@@ -9,6 +9,8 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include <iostream>
 #include <type_traits>
+#include <vector>
+#include <string>
 
 using namespace units;
 TEST(MeasurementStrings, basic)

diff --git a/test/test_r20.cpp b/test/test_r20.cpp
@@ -9,6 +9,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units.hpp"
 
 #include <tuple>
+#include <string>
+#include <iostream>
 
 using unitD = std::tuple<const char*, const char*, units::precise_unit>;
 #ifdef ENABLE_UNIT_MAP_ACCESS

diff --git a/test/test_random_round_trip.cpp b/test/test_random_round_trip.cpp
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <chrono>
 #include <limits>
 #include <random>
+#include <vector>
 
 using namespace units;
 

diff --git a/test/test_siunits.cpp b/test/test_siunits.cpp
@@ -12,6 +12,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <fstream>
 #include <ostream>
 #include <sstream>
+#include <vector>
+#include <string>
+#include <utility>
 
 static std::vector<std::vector<std::string>>
     loadCsvFile(const std::string& file)

diff --git a/test/test_ucum.cpp b/test/test_ucum.cpp
@@ -14,6 +14,9 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <json.hpp>
 #include <ostream>
 #include <sstream>
+#include <set>
+#include <string>
+#include <iostream>
 
 TEST(UCUM, domain_exclusion)
 {

diff --git a/test/test_udunits.cpp b/test/test_udunits.cpp
@@ -13,6 +13,8 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <fstream>
 #include <ostream>
 #include <sstream>
+#include <string>
+#include <iostream>
 
 TEST(UDUNITS, acceptedNameSymbols)
 {

diff --git a/test/test_uncertain_measurements.cpp b/test/test_uncertain_measurements.cpp
@@ -9,6 +9,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include "units/units.hpp"
 
 #include <memory>
+#include <string>
 
 using namespace units;
 TEST(uncertainOps, construction)

diff --git a/test/test_unit_strings.cpp b/test/test_unit_strings.cpp
@@ -8,6 +8,9 @@ SPDX-License-Identifier: BSD-3-Clause
 
 #include "test.hpp"
 #include <algorithm>
+#include <limits>
+#include <string>
+#include <vector>
 
 #if (__cplusplus >= 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 201703)
 #ifndef UNITS_CONSTEXPR_IF_SUPPORTED

diff --git a/units/r20_conv.cpp b/units/r20_conv.cpp
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <cstring>
 #include <tuple>
 #include <unordered_map>
+#include <string>
 
 namespace units {
 namespace precise {

diff --git a/units/unit_definitions.hpp b/units/unit_definitions.hpp
@@ -602,7 +602,7 @@ namespace precise {
         }  // namespace metric
 
         namespace ING {
-            // l'Imprimerie nationale, ING
+            // l'Imprimerie nationale, IN Group
             constexpr precise_unit point{0.4, mm};
             constexpr precise_unit pica{12.0, point};
         }  // namespace ING

diff --git a/units/x12_conv.cpp b/units/x12_conv.cpp
@@ -10,6 +10,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <array>
 #include <cstring>
 #include <tuple>
+#include <string>
 
 namespace UNITS_NAMESPACE {
 using unitD = std::tuple<const char*, const char*, precise_unit>;

diff --git a/webserver/unit_web_server.cpp b/webserver/unit_web_server.cpp
@@ -38,6 +38,7 @@ SPDX-License-Identifier: BSD-3-Clause
 #include <string>
 #include <thread>
 #include <vector>
+#include <utility>
 
 #include "units/units.hpp"