From db0a43a228346f6e8cff12ea9bbff8ca80cd9bdf Mon Sep 17 00:00:00 2001 From: Norbert Nemec Date: Tue, 9 Oct 2012 14:06:20 +0200 Subject: [PATCH] Disable warning C4355 for plain.hpp similar to server.hpp (beware: this hides a real design problem) --- src/sockets/plain.hpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/sockets/plain.hpp b/src/sockets/plain.hpp index 201d86c249..48aa910799 100644 --- a/src/sockets/plain.hpp +++ b/src/sockets/plain.hpp @@ -35,6 +35,12 @@ #include +#ifdef _MSC_VER +// Disable "warning C4355: 'this' : used in base member initializer list". +# pragma warning(push) +# pragma warning(disable:4355) +#endif + namespace websocketpp { namespace socket { @@ -116,4 +122,8 @@ private: } // namespace socket } // namespace websocketpp +#ifdef _MSC_VER +# pragma warning(pop) +#endif + #endif // WEBSOCKETPP_SOCKET_PLAIN_HPP