Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/src/catch2
diff options
context:
space:
mode:
authorMartin Hořeňovský2021-10-05 20:11:42 +0200
committerMartin Hořeňovský2021-10-05 20:39:28 +0200
commit4e6d306742cdaab773bf98277e30e77922bb8ee1 (patch)
tree2769b78696408c68bf16d3782cfc535f07d2a118 /src/catch2
parentc6c46a168f5213d2daa4eccd6d725ced11229c49 (diff)
downloadcatch3-4e6d306742cdaab773bf98277e30e77922bb8ee1.tar.gz
Rename Catch::Option to Optional
Diffstat (limited to 'src/catch2')
-rw-r--r--src/catch2/catch_all.hpp2
-rw-r--r--src/catch2/internal/catch_optional.hpp (renamed from src/catch2/internal/catch_option.hpp)20
-rw-r--r--src/catch2/internal/catch_run_context.hpp4
-rw-r--r--src/catch2/reporters/catch_reporter_streaming_base.hpp8
4 files changed, 17 insertions, 17 deletions
diff --git a/src/catch2/catch_all.hpp b/src/catch2/catch_all.hpp
index 35bd9741..e9fadf96 100644
--- a/src/catch2/catch_all.hpp
+++ b/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>
diff --git a/src/catch2/internal/catch_option.hpp b/src/catch2/internal/catch_optional.hpp
index da335653..e2d7b057 100644
--- a/src/catch2/internal/catch_option.hpp
+++ b/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
diff --git a/src/catch2/internal/catch_run_context.hpp b/src/catch2/internal/catch_run_context.hpp
index 7c315e9a..e0b64a04 100644
--- a/src/catch2/internal/catch_run_context.hpp
+++ b/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;
diff --git a/src/catch2/reporters/catch_reporter_streaming_base.hpp b/src/catch2/reporters/catch_reporter_streaming_base.hpp
index e7b6e5b3..ee40fbeb 100644
--- a/src/catch2/reporters/catch_reporter_streaming_base.hpp
+++ b/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;