Rename catch_assertionhandler -> catch_assertion_handler

src/CMakeLists.txt

@@ -38,7 +38,7 @@ set(INTERNAL_HEADERS
     ${SOURCES_DIR}/matchers/internal/catch_matchers_impl.hpp
     ${SOURCES_DIR}/internal/catch_container_nonmembers.hpp
     ${SOURCES_DIR}/catch_approx.hpp
-    ${SOURCES_DIR}/internal/catch_assertionhandler.hpp
+    ${SOURCES_DIR}/internal/catch_assertion_handler.hpp
     ${SOURCES_DIR}/catch_assertion_info.hpp
     ${SOURCES_DIR}/catch_assertion_result.hpp
     ${SOURCES_DIR}/internal/catch_test_macro_impl.hpp
@@ -130,7 +130,7 @@ set(INTERNAL_HEADERS
 )
 set(IMPL_SOURCES
     ${SOURCES_DIR}/catch_approx.cpp
-    ${SOURCES_DIR}/internal/catch_assertionhandler.cpp
+    ${SOURCES_DIR}/internal/catch_assertion_handler.cpp
     ${SOURCES_DIR}/catch_assertion_result.cpp
     ${SOURCES_DIR}/matchers/internal/catch_matchers_combined_tu.cpp
     ${SOURCES_DIR}/internal/catch_commandline.cpp

src/catch2/catch_all.hpp

@@ -37,7 +37,7 @@
 #include <catch2/catch_version_macros.hpp>
 #include <catch2/generators/catch_generators_all.hpp>
 #include <catch2/interfaces/catch_interfaces_all.hpp>
-#include <catch2/internal/catch_assertionhandler.hpp>
+#include <catch2/internal/catch_assertion_handler.hpp>
 #include <catch2/internal/catch_clara.hpp>
 #include <catch2/internal/catch_clara_upstream.hpp>
 #include <catch2/internal/catch_commandline.hpp>

src/catch2/catch_assertion_result.hpp

@@ -13,7 +13,7 @@
 #include <catch2/internal/catch_result_type.hpp>
 #include <catch2/internal/catch_common.hpp>
 #include <catch2/internal/catch_stringref.hpp>
-#include <catch2/internal/catch_assertionhandler.hpp>
+#include <catch2/internal/catch_assertion_handler.hpp>
 
 namespace Catch {
 

src/catch2/internal/catch_assertion_handler.cpp

@@ -6,7 +6,7 @@
  *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <catch2/internal/catch_assertionhandler.hpp>
+#include <catch2/internal/catch_assertion_handler.hpp>
 #include <catch2/catch_assertion_result.hpp>
 #include <catch2/interfaces/catch_interfaces_runner.hpp>
 #include <catch2/interfaces/catch_interfaces_config.hpp>
@@ -32,10 +32,6 @@ namespace Catch {
 
     LazyExpression::LazyExpression( LazyExpression const& other ) : m_isNegated( other.m_isNegated ) {}
 
-    LazyExpression::operator bool() const {
-        return m_transientExpression != nullptr;
-    }
-
     auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream& {
         if( lazyExpr.m_isNegated )
             os << "!";

src/catch2/internal/catch_assertion_handler.hpp

@@ -31,7 +31,9 @@ namespace Catch {
         LazyExpression( LazyExpression const& other );
         LazyExpression& operator = ( LazyExpression const& ) = delete;
 
-        explicit operator bool() const;
+        explicit operator bool() const {
+            return m_transientExpression != nullptr;
+        }
 
         friend auto operator << ( std::ostream& os, LazyExpression const& lazyExpr ) -> std::ostream&;
     };

src/catch2/internal/catch_exception_translator_registry.cpp

@@ -7,7 +7,7 @@
  */
 
 #include <catch2/internal/catch_exception_translator_registry.hpp>
-#include <catch2/internal/catch_assertionhandler.hpp>
+#include <catch2/internal/catch_assertion_handler.hpp>
 #include <catch2/internal/catch_compiler_capabilities.hpp>
 #include <catch2/internal/catch_enforce.hpp>
 

src/catch2/internal/catch_run_context.hpp

@@ -20,7 +20,7 @@
 #include <catch2/catch_totals.hpp>
 #include <catch2/catch_test_spec.hpp>
 #include <catch2/internal/catch_test_case_tracker.hpp>
-#include <catch2/internal/catch_assertionhandler.hpp>
+#include <catch2/internal/catch_assertion_handler.hpp>
 
 #include <string>
 

src/catch2/internal/catch_test_macro_impl.hpp

@@ -8,7 +8,7 @@
 #ifndef TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
 #define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
 
-#include <catch2/internal/catch_assertionhandler.hpp>
+#include <catch2/internal/catch_assertion_handler.hpp>
 #include <catch2/interfaces/catch_interfaces_capture.hpp>
 #include <catch2/internal/catch_stringref.hpp>