Merge pull request #363 from MarcelRaad/patch-1

Suppress warning also for VS2017
pull/341/head
Jeffrey Walton 2017-01-13 08:39:04 -05:00 committed by GitHub
commit 58554cae36
1 changed files with 2 additions and 2 deletions

4
wait.h
View File

@ -34,7 +34,7 @@
// http://connect.microsoft.com/VisualStudio/feedback/details/1581706 // http://connect.microsoft.com/VisualStudio/feedback/details/1581706
// and http://github.com/weidai11/cryptopp/issues/214 // and http://github.com/weidai11/cryptopp/issues/214
#if CRYPTOPP_MSC_VERSION == 1900 #if (CRYPTOPP_MSC_VERSION >= 1900) && (CRYPTOPP_MSC_VERSION < 2000)
# pragma warning(push) # pragma warning(push)
# pragma warning(disable: 4589) # pragma warning(disable: 4589)
#endif #endif
@ -226,7 +226,7 @@ private:
NAMESPACE_END NAMESPACE_END
#if CRYPTOPP_MSC_VERSION == 1900 #if (CRYPTOPP_MSC_VERSION >= 1900) && (CRYPTOPP_MSC_VERSION < 2000)
# pragma warning(pop) # pragma warning(pop)
#endif #endif