Merge pull request #2733 from wmamrak/patch-1

Disable MSVC warning C4309
8 years ago · d41c47fff9
parent 8d61f9c3bf 37bd5d525b
commit d41c47fff9
1 changed files with 1 additions and 1 deletions
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@ -135,7 +135,7 @@ endif (protobuf_BUILD_SHARED_LIBS)
 if (MSVC)
  # Build with multiple processes
  add_definitions(/MP)
-  add_definitions(/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305)
+  add_definitions(/wd4244 /wd4267 /wd4018 /wd4355 /wd4800 /wd4251 /wd4996 /wd4146 /wd4305 /wd4309)
  # Allow big object
  add_definitions(/bigobj)
  string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR})