diff options
| author | Martin Hořeňovský | 2020-08-18 13:44:37 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2020-08-18 21:02:30 +0200 |
| commit | e418e75c74274354b4c2c7597d919929426d89c8 (patch) | |
| tree | 13eeb7f7cce541a7da9ca102b240033b7e4f2bd6 /src/catch2/internal | |
| parent | 6a46b344c02b2548b11e4b66f95618bd5c90d110 (diff) | |
| download | catch3-e418e75c74274354b4c2c7597d919929426d89c8.tar.gz | |
Turn CaseSensitive into proper enum class
Diffstat (limited to 'src/catch2/internal')
| -rw-r--r-- | src/catch2/internal/catch_case_sensitive.hpp | 4 | ||||
| -rw-r--r-- | src/catch2/internal/catch_wildcard_pattern.cpp | 2 | ||||
| -rw-r--r-- | src/catch2/internal/catch_wildcard_pattern.hpp | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/catch2/internal/catch_case_sensitive.hpp b/src/catch2/internal/catch_case_sensitive.hpp index ad765546..4d57107a 100644 --- a/src/catch2/internal/catch_case_sensitive.hpp +++ b/src/catch2/internal/catch_case_sensitive.hpp @@ -3,9 +3,7 @@ namespace Catch { - struct CaseSensitive { - enum Choice { Yes, No }; - }; + enum class CaseSensitive { Yes, No }; } // namespace Catch diff --git a/src/catch2/internal/catch_wildcard_pattern.cpp b/src/catch2/internal/catch_wildcard_pattern.cpp index 9013984f..f140bf29 100644 --- a/src/catch2/internal/catch_wildcard_pattern.cpp +++ b/src/catch2/internal/catch_wildcard_pattern.cpp @@ -12,7 +12,7 @@ namespace Catch { WildcardPattern::WildcardPattern( std::string const& pattern, - CaseSensitive::Choice caseSensitivity ) + CaseSensitive caseSensitivity ) : m_caseSensitivity( caseSensitivity ), m_pattern( normaliseString( pattern ) ) { diff --git a/src/catch2/internal/catch_wildcard_pattern.hpp b/src/catch2/internal/catch_wildcard_pattern.hpp index 1dea8670..749f62da 100644 --- a/src/catch2/internal/catch_wildcard_pattern.hpp +++ b/src/catch2/internal/catch_wildcard_pattern.hpp @@ -24,13 +24,13 @@ namespace Catch public: - WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity ); + WildcardPattern( std::string const& pattern, CaseSensitive caseSensitivity ); virtual ~WildcardPattern() = default; virtual bool matches( std::string const& str ) const; private: std::string normaliseString( std::string const& str ) const; - CaseSensitive::Choice m_caseSensitivity; + CaseSensitive m_caseSensitivity; WildcardPosition m_wildcard = NoWildcard; std::string m_pattern; }; |