From eb9ab6f70fd49db7d9d6df20c76b86ba7ad71ff7 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Mon, 5 Aug 2013 08:32:28 -0500 Subject: [PATCH] add constexpr to static logging tests --- websocketpp/logger/basic.hpp | 3 ++- websocketpp/logger/stub.hpp | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/websocketpp/logger/basic.hpp b/websocketpp/logger/basic.hpp index 975d45deb5..e74bad0718 100644 --- a/websocketpp/logger/basic.hpp +++ b/websocketpp/logger/basic.hpp @@ -44,6 +44,7 @@ #include #include +#include #include #include @@ -101,7 +102,7 @@ public: m_out->flush(); } - bool static_test(level channel) const { + _WEBSOCKETPP_CONSTEXPR_TOKEN_ bool static_test(level channel) const { return ((channel & m_static_channels) != 0); } diff --git a/websocketpp/logger/stub.hpp b/websocketpp/logger/stub.hpp index f967612a8c..3f78e96cc6 100644 --- a/websocketpp/logger/stub.hpp +++ b/websocketpp/logger/stub.hpp @@ -30,6 +30,7 @@ #include +#include #include namespace websocketpp { @@ -40,6 +41,9 @@ class stub { public: stub(std::ostream* out = &std::cout) {} stub(level c, std::ostream* out = &std::cout) {} + explicit stub(std::ostream * out) {} + stub(level c, std::ostream * out) {} + _WEBSOCKETPP_CONSTEXPR_TOKEN_ stub() {} void set_channels(level channels) {} void clear_channels(level channels) {} @@ -47,8 +51,10 @@ public: void write(level channel, const std::string& msg) {} void write(level channel, const char* msg) {} - bool static_test(level channel) const {return false;} bool dynamic_test(level channel) {return false;} + _WEBSOCKETPP_CONSTEXPR_TOKEN_ bool static_test(level channel) const { + return false; + } }; } // log