activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1516546 - in /activemq/activemq-cpp/trunk/activemq-cpp/src/main: activemq/util/Config.h decaf/util/Config.h
Date Thu, 22 Aug 2013 19:27:22 GMT
Author: tabish
Date: Thu Aug 22 19:27:22 2013
New Revision: 1516546

URL: http://svn.apache.org/r1516546
Log:
https://issues.apache.org/jira/browse/AMQCPP-507

some macros have changed in later VS compilers so we need to adjust what we set and when.


Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h?rev=1516546&r1=1516545&r2=1516546&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h Thu Aug 22 19:27:22
2013
@@ -69,12 +69,15 @@
         #ifndef HAVE_WINDOWS_H
             #define HAVE_WINDOWS_H
         #endif
-        #ifndef _SECURE_SCL
-            #define _SECURE_SCL 1
-        #endif
-        #ifndef _SCL_SECURE_NO_WARNINGS
-            #define _SCL_SECURE_NO_WARNINGS 1
+        #if defined(_MSC_VER) && _MSC_VER < 1600
+            #ifndef _SECURE_SCL
+                #define _SECURE_SCL 1
+            #endif
+            #ifndef _SCL_SECURE_NO_WARNINGS
+                #define _SCL_SECURE_NO_WARNINGS 1
+            #endif
         #endif
+
     #else
         #ifndef HAVE_UUID_UUID_H
             #define HAVE_UUID_UUID_H

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h?rev=1516546&r1=1516545&r2=1516546&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/Config.h Thu Aug 22 19:27:22
2013
@@ -89,11 +89,13 @@
             #pragma warning(disable: 4822)
         #endif
 
-        #ifndef _SECURE_SCL
-            #define _SECURE_SCL 1
-        #endif
-        #ifndef _SCL_SECURE_NO_WARNINGS
-            #define _SCL_SECURE_NO_WARNINGS 1
+        #if defined(_MSC_VER) && _MSC_VER < 1600
+            #ifndef _SECURE_SCL
+                #define _SECURE_SCL 1
+            #endif
+            #ifndef _SCL_SECURE_NO_WARNINGS
+                #define _SCL_SECURE_NO_WARNINGS 1
+            #endif
         #endif
 
         /*



Mime
View raw message