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

summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-05-30 15:43:37 +0200
committerMartin Hořeňovský2020-05-30 15:44:46 +0200
commit66ab942903aaaaf3b6606a8125e55d0d844d7478 (patch)
treeec0e8e3598b74337cb2f75b1875c3e4cf8442ab9 /src
parentd05a8e2e24927509bd1ac97c86e0d00398086621 (diff)
downloadcatch3-66ab942903aaaaf3b6606a8125e55d0d844d7478.tar.gz
Refactor StreamEndStop slightly
Diffstat (limited to 'src')
-rw-r--r--src/catch2/internal/catch_common.cpp4
-rw-r--r--src/catch2/internal/catch_common.hpp14
2 files changed, 9 insertions, 9 deletions
diff --git a/src/catch2/internal/catch_common.cpp b/src/catch2/internal/catch_common.cpp
index 5398540f..aaf08079 100644
--- a/src/catch2/internal/catch_common.cpp
+++ b/src/catch2/internal/catch_common.cpp
@@ -33,8 +33,4 @@ namespace Catch {
return os;
}
- std::string StreamEndStop::operator+() const {
- return std::string();
- }
-
} // end namespace Catch
diff --git a/src/catch2/internal/catch_common.hpp b/src/catch2/internal/catch_common.hpp
index cc090533..a46c46b3 100644
--- a/src/catch2/internal/catch_common.hpp
+++ b/src/catch2/internal/catch_common.hpp
@@ -9,6 +9,7 @@
#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
#include <catch2/internal/catch_compiler_capabilities.hpp>
+#include <catch2/internal/catch_stringref.hpp>
#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
@@ -70,12 +71,15 @@ namespace Catch {
// as well as
// >> stuff +StreamEndStop
struct StreamEndStop {
- std::string operator+() const;
+ StringRef operator+() const {
+ return StringRef();
+ }
+
+ template<typename T>
+ friend T const& operator + ( T const& value, StreamEndStop ) {
+ return value;
+ }
};
- template<typename T>
- T const& operator + ( T const& value, StreamEndStop ) {
- return value;
- }
}
#define CATCH_INTERNAL_LINEINFO \