svn commit: r955742 - in /qpid/trunk/qpid/cpp: CMakeLists.txt src/CMakeLists.txt

[sh...@apache.org]

Author: shuston
Date: Thu Jun 17 20:59:45 2010
New Revision: 955742

URL: http://svn.apache.org/viewvc?rev=955742&view=rev
Log:
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.

Modified:
    qpid/trunk/qpid/cpp/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/CMakeLists.txt

Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=955742&r1=955741&r2=955742&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Thu Jun 17 20:59:45 2010
@@ -30,6 +30,15 @@ set (qpidc_version ${QPID_VERSION_MAJOR}
 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")

Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=955742&r1=955741&r2=955742&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu Jun 17 20:59:45 2010
@@ -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



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org