From b178ae800c5a8847b15339a16f85c441578d0217 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 1 Feb 2019 18:27:56 +0000 Subject: [PATCH] Add Catch.hpp StringMaker template specialisation for rdcstr * Otherwise it gets identified as a 'range' with begin() / end() and "foobar" gets printed as { 'f', 'o', 'o', 'b', 'a', 'r' } --- renderdoc/3rdparty/catch/catch.hpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/renderdoc/3rdparty/catch/catch.hpp b/renderdoc/3rdparty/catch/catch.hpp index d911bea6a..83b207457 100644 --- a/renderdoc/3rdparty/catch/catch.hpp +++ b/renderdoc/3rdparty/catch/catch.hpp @@ -29,6 +29,16 @@ #define CATCH_CONFIG_FORCE_FALLBACK_STRINGIFIER #define CATCH_CONFIG_INLINE_DEBUG_BREAK +#include "api/replay/basic_types.h" #include "api/replay/stringise.h" -#include "official/catch.hpp" \ No newline at end of file +#include "official/catch.hpp" + +namespace Catch +{ +template <> +struct StringMaker +{ + static std::string convert(rdcstr const &value) { return value; } +}; +} \ No newline at end of file