From 661ddad1f24ab03b44ee77c1f79bf938a8c47687 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 24 Mar 2017 23:24:46 -0400 Subject: [PATCH] Fix Solaris compile due to StreamState "validate.h", line 155: Error: Overloading ambiguity between "std::ios::basic_ios(std::streambuf *)" and "std::ios::basic_ios(int)". --- validate.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/validate.h b/validate.h index ad690c28..b6fc1eca 100644 --- a/validate.h +++ b/validate.h @@ -121,7 +121,7 @@ bool TestHuffmanCodes(); bool TestASN1Parse(); #endif -#if 0 +#if 1 // Coverity findings in benchmark and validation routines class StreamState { @@ -148,6 +148,7 @@ private: }; #endif +#if 0 class StreamState { public: @@ -166,6 +167,7 @@ private: std::ostream& m_out; std::ios m_state; }; +#endif // Safer functions on Windows for C&A, https://github.com/weidai11/cryptopp/issues/55 static std::string TimeToString(const time_t& t)