From c5c3d368a2ef3c22467e708108b2bdbcae0fd71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Wed, 3 May 2017 00:29:36 +0200 Subject: [PATCH] Added std:: qualification to nullptr_t Apparently Clang doesn't like it unqualfied :smile: --- include/internal/catch_tostring.h | 2 +- include/internal/catch_tostring.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/internal/catch_tostring.h b/include/internal/catch_tostring.h index 02eb0d6f..6a20f9ef 100644 --- a/include/internal/catch_tostring.h +++ b/include/internal/catch_tostring.h @@ -180,7 +180,7 @@ namespace Catch { }; template<> - struct StringMaker { + struct StringMaker { std::string operator()(std::nullptr_t); }; diff --git a/include/internal/catch_tostring.hpp b/include/internal/catch_tostring.hpp index 8fc3c89e..06046095 100644 --- a/include/internal/catch_tostring.hpp +++ b/include/internal/catch_tostring.hpp @@ -197,7 +197,7 @@ std::string StringMaker::operator()(unsigned char c) { return ::Catch::Detail::stringify(static_cast(c)); } -std::string StringMaker::operator()(std::nullptr_t) { +std::string StringMaker::operator()(std::nullptr_t) { return "nullptr"; }