Skip to content

Commit bb0d751

Browse files
author
Michael Fero
committed
win: Fix compilation issue with IGNORE keyword and ignore implicit 64-bit shift warning
1 parent e7b307b commit bb0d751

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
403403
add_definitions(/wd4244)
404404
add_definitions(/wd4267)
405405
add_definitions(/wd4800) # Performance warning due to automatic compiler casting from int to bool
406+
add_definitions(/wd4334) # Implicit casting for 64-bit shift
406407

407408
# Add preprocessor definitions for proper compilation
408409
add_definitions(-D_WIN32_WINNT=0x0501) # Required for winsock (pre Windows XP wspiapi.h only)

src/retry_policy.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
#include "cassandra.h"
2121
#include "ref_counted.hpp"
2222

23+
#ifdef _WIN32
24+
# ifdef IGNORE
25+
# undef IGNORE
26+
# endif
27+
#endif
28+
2329
namespace cass {
2430

2531
class RetryPolicy : public RefCounted<RetryPolicy> {

0 commit comments

Comments
 (0)