Преглед на файлове

Merge pull request #2733 from wmamrak/patch-1

Disable MSVC warning C4309
Adam Cozzette преди 8 години
родител
ревизия
d41c47fff9
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      cmake/CMakeLists.txt

+ 1 - 1
cmake/CMakeLists.txt

@@ -135,7 +135,7 @@ endif (protobuf_BUILD_SHARED_LIBS)
 if (MSVC)
 if (MSVC)
   # Build with multiple processes
   # Build with multiple processes
   add_definitions(/MP)
   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
   # Allow big object
   add_definitions(/bigobj)
   add_definitions(/bigobj)
   string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR})
   string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR})