Move Approx out of the Detail namespace

src/catch2/catch.hpp

@@ -60,6 +60,4 @@
 
 #include <catch2/catch_reenable_warnings.h>
 
-using Catch::Detail::Approx;
-
 #endif // TWOBLUECUBES_CATCH_HPP_INCLUDED

src/catch2/catch_approx.cpp

@@ -23,7 +23,6 @@ bool marginComparison(double lhs, double rhs, double margin) {
 }
 
 namespace Catch {
-namespace Detail {
 
     Approx::Approx ( double value )
     :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
@@ -70,18 +69,16 @@ namespace Detail {
         m_epsilon = newEpsilon;
     }
 
-} // end namespace Detail
-
 namespace literals {
-    Detail::Approx operator "" _a(long double val) {
+    Approx operator "" _a(long double val) {
-        return Detail::Approx(val);
+        return Approx(val);
     }
-    Detail::Approx operator "" _a(unsigned long long val) {
+    Approx operator "" _a(unsigned long long val) {
-        return Detail::Approx(val);
+        return Approx(val);
     }
 } // end namespace literals
 
-std::string StringMaker<Catch::Detail::Approx>::convert(Catch::Detail::Approx const& value) {
+std::string StringMaker<Catch::Approx>::convert(Catch::Approx const& value) {
     return value.toString();
 }
 

src/catch2/catch_approx.h

@@ -13,7 +13,6 @@
 #include <type_traits>
 
 namespace Catch {
-namespace Detail {
 
     class Approx {
     private:
@@ -115,16 +114,15 @@ namespace Detail {
         double m_scale;
         double m_value;
     };
-} // end namespace Detail
 
 namespace literals {
-    Detail::Approx operator "" _a(long double val);
+    Approx operator "" _a(long double val);
-    Detail::Approx operator "" _a(unsigned long long val);
+    Approx operator "" _a(unsigned long long val);
 } // end namespace literals
 
 template<>
-struct StringMaker<Catch::Detail::Approx> {
+struct StringMaker<Catch::Approx> {
-    static std::string convert(Catch::Detail::Approx const& value);
+    static std::string convert(Catch::Approx const& value);
 };
 
 } // end namespace Catch

src/catch2/catch_matchers_vector.h

@@ -124,7 +124,7 @@ namespace Matchers {
             }
 
             std::vector<T> const& m_comparator;
-            mutable Catch::Detail::Approx approx = Catch::Detail::Approx::custom();
+            mutable Catch::Approx approx = Catch::Approx::custom();
         };
 
         template<typename T>

tests/SelfTest/Baselines/compact.sw.approved.txt

@@ -1108,7 +1108,7 @@ CmdLine.tests.cpp:<line number>: passed: config.benchmarkSamples == 200 for: 200
 CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-resamples=20000" }) for: {?}
 CmdLine.tests.cpp:<line number>: passed: config.benchmarkResamples == 20000 for: 20000 (0x<hex digits>) == 20000 (0x<hex digits>)
 CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-confidence-interval=0.99" }) for: {?}
-CmdLine.tests.cpp:<line number>: passed: config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99) for: 0.99 == Approx( 0.99 )
+CmdLine.tests.cpp:<line number>: passed: config.benchmarkConfidenceInterval == Catch::Approx(0.99) for: 0.99 == Approx( 0.99 )
 CmdLine.tests.cpp:<line number>: passed: cli.parse({ "test", "--benchmark-no-analysis" }) for: {?}
 CmdLine.tests.cpp:<line number>: passed: config.benchmarkNoAnalysis for: true
 Misc.tests.cpp:<line number>: passed: std::tuple_size<TestType>::value >= 1 for: 3 >= 1

tests/SelfTest/Baselines/console.sw.approved.txt

@@ -8022,7 +8022,7 @@ with expansion:
   {?}
 
 CmdLine.tests.cpp:<line number>: PASSED:
-  REQUIRE( config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99) )
+  REQUIRE( config.benchmarkConfidenceInterval == Catch::Approx(0.99) )
 with expansion:
   0.99 == Approx( 0.99 )
 

tests/SelfTest/Baselines/tap.sw.approved.txt

@@ -2139,7 +2139,7 @@ ok 1067 - config.benchmarkResamples == 20000 for: 20000 (0x<hex digits>) == 2000
 # Process can be configured on command line
 ok 1068 - cli.parse({ "test", "--benchmark-confidence-interval=0.99" }) for: {?}
 # Process can be configured on command line
-ok 1069 - config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99) for: 0.99 == Approx( 0.99 )
+ok 1069 - config.benchmarkConfidenceInterval == Catch::Approx(0.99) for: 0.99 == Approx( 0.99 )
 # Process can be configured on command line
 ok 1070 - cli.parse({ "test", "--benchmark-no-analysis" }) for: {?}
 # Process can be configured on command line

tests/SelfTest/Baselines/xml.sw.approved.txt

@@ -10103,7 +10103,7 @@ Nor would this
           </Expression>
           <Expression success="true" type="REQUIRE" filename="tests/<exe-name>/IntrospectiveTests/CmdLine.tests.cpp" >
             <Original>
-              config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99)
+              config.benchmarkConfidenceInterval == Catch::Approx(0.99)
             </Original>
             <Expanded>
               0.99 == Approx( 0.99 )

tests/SelfTest/IntrospectiveTests/CmdLine.tests.cpp

@@ -489,7 +489,7 @@ TEST_CASE( "Process can be configured on command line", "[config][command-line]"
         SECTION("resamples") {
             CHECK(cli.parse({ "test", "--benchmark-confidence-interval=0.99" }));
 
-            REQUIRE(config.benchmarkConfidenceInterval == Catch::Detail::Approx(0.99));
+            REQUIRE(config.benchmarkConfidenceInterval == Catch::Approx(0.99));
         }
 
         SECTION("resamples") {

tests/SelfTest/IntrospectiveTests/GeneratorsImpl.tests.cpp

@@ -178,7 +178,7 @@ TEST_CASE("Generators internals", "[generators][internals]") {
             }
 
             SECTION("Floating Point") {
-                using Catch::Detail::Approx;
+                using Catch::Approx;
                 SECTION("Exact") {
                     const auto rangeStart = -1.;
                     const auto rangeEnd = 1.;

tests/SelfTest/UsageTests/Approx.tests.cpp

@@ -11,7 +11,7 @@
 
 #include <cmath>
 
-using Catch::Detail::Approx;
+using Catch::Approx;
 
 namespace { namespace ApproxTests {
 

tests/SelfTest/UsageTests/Condition.tests.cpp

@@ -14,7 +14,7 @@
 #include <catch2/catch_approx.h>
 #include <catch2/catch_test_macros.hpp>
 
-using Catch::Detail::Approx;
+using Catch::Approx;
 
 #include <string>
 #include <limits>