[QGIS Commit] r15213 - in trunk/qgis/src: analysis/raster core gui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Feb 19 12:17:06 EST 2011
Author: jef
Date: 2011-02-19 09:17:06 -0800 (Sat, 19 Feb 2011)
New Revision: 15213
Modified:
trunk/qgis/src/analysis/raster/qgsrastercalcparser.yy
trunk/qgis/src/core/qgssearchstringlexer.ll
trunk/qgis/src/gui/CMakeLists.txt
Log:
fix msvc fixes
Modified: trunk/qgis/src/analysis/raster/qgsrastercalcparser.yy
===================================================================
--- trunk/qgis/src/analysis/raster/qgsrastercalcparser.yy 2011-02-19 16:21:35 UTC (rev 15212)
+++ trunk/qgis/src/analysis/raster/qgsrastercalcparser.yy 2011-02-19 17:17:06 UTC (rev 15213)
@@ -20,8 +20,8 @@
#include "qgsrastercalcnode.h"
#ifdef _MSC_VER
-# pragma warnings( disable: 4065 ) // switch statement contains 'default' but no 'case' labels
-# pragma warnings( disable: 4701 ) // Potentially uninitialized local variable 'name' used
+# pragma warning( disable: 4065 ) // switch statement contains 'default' but no 'case' labels
+# pragma warning( disable: 4701 ) // Potentially uninitialized local variable 'name' used
#endif
// don't redeclare malloc/free
Modified: trunk/qgis/src/core/qgssearchstringlexer.ll
===================================================================
--- trunk/qgis/src/core/qgssearchstringlexer.ll 2011-02-19 16:21:35 UTC (rev 15212)
+++ trunk/qgis/src/core/qgssearchstringlexer.ll 2011-02-19 17:17:06 UTC (rev 15213)
@@ -36,7 +36,9 @@
// which doesn't in MSVC compiler
#define YY_NEVER_INTERACTIVE 1
+#ifndef YY_NO_UNPUT
#define YY_NO_UNPUT // unused
+#endif
#ifdef _MSC_VER
#define YY_NO_UNISTD_H
Modified: trunk/qgis/src/gui/CMakeLists.txt
===================================================================
--- trunk/qgis/src/gui/CMakeLists.txt 2011-02-19 16:21:35 UTC (rev 15212)
+++ trunk/qgis/src/gui/CMakeLists.txt 2011-02-19 17:17:06 UTC (rev 15213)
@@ -135,10 +135,12 @@
ENDIF (MSVC)
ENDIF (WIN32)
-IF(NOT MSVC)
- # disable deprecation warnings for qgisinterface (re-exporting deprecated methods)
+# disable deprecation warnings for qgisinterface (re-exporting deprecated methods)
+IF(MSVC)
+ SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/src/gui/moc_qgisinterface.cxx PROPERTIES COMPILE_FLAGS "-wd4996")
+ELSE(MSVC)
SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/src/gui/moc_qgisinterface.cxx PROPERTIES COMPILE_FLAGS "-w")
-ENDIF(NOT MSVC)
+ENDIF(MSVC)
#############################################################
# qgis_gui library
More information about the QGIS-commit
mailing list