From 7d3d3ebbccd46451f19d7a80e68e11dde7ae139f Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Thu, 17 Jun 2010 20:59:45 +0000 Subject: Change warning C4996 from level 1 to level 4. This is the "warning C4996: 'std::equal': Function call with parameters that may be unsafe" warning. The "safe" replacements are only available on Windows, so can't be portably used. If the conditions are violated run-time errors are thrown, so these aren't totally ignored. Changing them to level 4 makes it possible for someone to easily find them all in a build if desired. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@955742 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/CMakeLists.txt | 9 +++++++++ qpid/cpp/src/CMakeLists.txt | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/qpid/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt index dbed67efea..68ac7b317a 100644 --- a/qpid/cpp/CMakeLists.txt +++ b/qpid/cpp/CMakeLists.txt @@ -30,6 +30,15 @@ set (qpidc_version ${QPID_VERSION_MAJOR}.${QPID_VERSION_MINOR}) enable_testing() include (CTest) +if (MSVC) + # Change warning C4996 from level 1 to level 4. These are real and shouldn't + # be completely ignored, but they're pretty well checked out and will throw + # a run-time error if violated. + # "warning C4996: 'std::equal': Function call with parameters that may + # be unsafe..." + add_definitions(/w44996) +endif (MSVC) + # Overall packaging/install options. # This section also has all the setup for various packaging-specific options. set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 70835746fb..44dea3a155 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -452,7 +452,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL Windows) /D "_CRT_NONSTDC_NO_WARNINGS" /D "NOMINMAX" /D "WIN32_LEAN_AND_MEAN" - /D "_SCL_SECURE_NO_WARNINGS" /wd4244 /wd4800 /wd4355 -- cgit v1.2.1