Try to fix MSVC C4589 warning again (GH #214)
This one is a chronic problem. It appears Microsoft needs to fix it in their compilerpull/566/head
parent
788cd1794d
commit
c6289edd44
3
wait.cpp
3
wait.cpp
|
|
@ -3,8 +3,11 @@
|
||||||
#include "pch.h"
|
#include "pch.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
// http://connect.microsoft.com/VisualStudio/feedback/details/1581706
|
||||||
|
// and http://github.com/weidai11/cryptopp/issues/214
|
||||||
#if CRYPTOPP_MSC_VERSION
|
#if CRYPTOPP_MSC_VERSION
|
||||||
# pragma warning(disable: 4189)
|
# pragma warning(disable: 4189)
|
||||||
|
# pragma warning(disable: 4589)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(NO_OS_DEPENDENCE) && (defined(SOCKETS_AVAILABLE) || defined(WINDOWS_PIPES_AVAILABLE))
|
#if !defined(NO_OS_DEPENDENCE) && (defined(SOCKETS_AVAILABLE) || defined(WINDOWS_PIPES_AVAILABLE))
|
||||||
|
|
|
||||||
4
wait.h
4
wait.h
|
|
@ -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) && (CRYPTOPP_MSC_VERSION < 2000)
|
#if (CRYPTOPP_MSC_VERSION >= 1900)
|
||||||
# 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) && (CRYPTOPP_MSC_VERSION < 2000)
|
#if (CRYPTOPP_MSC_VERSION >= 1900)
|
||||||
# pragma warning(pop)
|
# pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue