Rename Catch::Option to Optional

src/CMakeLists.txt

@@ -100,7 +100,7 @@ set(INTERNAL_HEADERS
     ${SOURCES_DIR}/internal/catch_message_info.hpp
     ${SOURCES_DIR}/internal/catch_meta.hpp
     ${SOURCES_DIR}/internal/catch_move_and_forward.hpp
-    ${SOURCES_DIR}/internal/catch_option.hpp
+    ${SOURCES_DIR}/internal/catch_optional.hpp
     ${SOURCES_DIR}/internal/catch_output_redirect.hpp
     ${SOURCES_DIR}/internal/catch_platform.hpp
     ${SOURCES_DIR}/internal/catch_polyfills.hpp

src/catch2/catch_all.hpp

@@ -74,7 +74,7 @@
 #include <catch2/internal/catch_meta.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 #include <catch2/internal/catch_noncopyable.hpp>
-#include <catch2/internal/catch_option.hpp>
+#include <catch2/internal/catch_optional.hpp>
 #include <catch2/internal/catch_output_redirect.hpp>
 #include <catch2/internal/catch_platform.hpp>
 #include <catch2/internal/catch_polyfills.hpp>

src/catch2/internal/catch_optional.hpp

@@ -5,28 +5,28 @@
 //        https://www.boost.org/LICENSE_1_0.txt)
 
 // SPDX-License-Identifier: BSL-1.0
-#ifndef CATCH_OPTION_HPP_INCLUDED
-#define CATCH_OPTION_HPP_INCLUDED
+#ifndef CATCH_OPTIONAL_HPP_INCLUDED
+#define CATCH_OPTIONAL_HPP_INCLUDED
 
 namespace Catch {
 
     // An optional type
     template<typename T>
-    class Option {
+    class Optional {
     public:
-        Option() : nullableValue( nullptr ) {}
-        Option( T const& _value )
+        Optional() : nullableValue( nullptr ) {}
+        Optional( T const& _value )
         : nullableValue( new( storage ) T( _value ) )
         {}
-        Option( Option const& _other )
+        Optional( Optional const& _other )
         : nullableValue( _other ? new( storage ) T( *_other ) : nullptr )
         {}
 
-        ~Option() {
+        ~Optional() {
             reset();
         }
 
-        Option& operator= ( Option const& _other ) {
+        Optional& operator= ( Optional const& _other ) {
             if( &_other != this ) {
                 reset();
                 if( _other )
@@ -34,7 +34,7 @@ namespace Catch {
             }
             return *this;
         }
-        Option& operator = ( T const& _value ) {
+        Optional& operator = ( T const& _value ) {
             reset();
             nullableValue = new( storage ) T( _value );
             return *this;
@@ -82,4 +82,4 @@ namespace Catch {
 
 } // end namespace Catch
 
-#endif // CATCH_OPTION_HPP_INCLUDED
+#endif // CATCH_OPTIONAL_HPP_INCLUDED

src/catch2/internal/catch_run_context.hpp

@@ -17,7 +17,7 @@
 #include <catch2/internal/catch_test_case_tracker.hpp>
 #include <catch2/catch_assertion_info.hpp>
 #include <catch2/catch_assertion_result.hpp>
-#include <catch2/internal/catch_option.hpp>
+#include <catch2/internal/catch_optional.hpp>
 #include <catch2/internal/catch_move_and_forward.hpp>
 
 #include <string>
@@ -126,7 +126,7 @@ namespace Catch {
         IMutableContext& m_context;
         TestCaseHandle const* m_activeTestCase = nullptr;
         ITracker* m_testCaseTracker = nullptr;
-        Option<AssertionResult> m_lastResult;
+        Optional<AssertionResult> m_lastResult;
 
         IConfig const* m_config;
         Totals m_totals;

src/catch2/reporters/catch_reporter_streaming_base.hpp

@@ -10,7 +10,7 @@
 
 #include <catch2/interfaces/catch_interfaces_reporter.hpp>
 
-#include <catch2/internal/catch_option.hpp>
+#include <catch2/internal/catch_optional.hpp>
 
 #include <iosfwd>
 #include <string>
@@ -19,14 +19,14 @@
 namespace Catch {
 
     template<typename T>
-    struct LazyStat : Option<T> {
+    struct LazyStat : Optional<T> {
         LazyStat& operator=(T const& _value) {
-            Option<T>::operator=(_value);
+            Optional<T>::operator=(_value);
             used = false;
             return *this;
         }
         void reset() {
-            Option<T>::reset();
+            Optional<T>::reset();
             used = false;
         }
         bool used = false;