fix windows build (fixes #9416)

qgis · Jan 24, 2014 · a78a003 · a78a003
1 parent 2a1ef13
commit a78a003
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/src/analysis/vector/mersenne-twister.cpp b/src/analysis/vector/mersenne-twister.cpp
@@ -21,7 +21,6 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 #include "mersenne-twister.h"
 
 /*

diff --git a/src/analysis/vector/mersenne-twister.h b/src/analysis/vector/mersenne-twister.h
@@ -22,7 +22,14 @@
 #ifndef MERSENNE_TWISTER_H
 #define MERSENNE_TWISTER_H
 
+#ifndef _MSC_VER
 #include <stdint.h>
+#else
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#endif
 #include <limits>
 
 #ifdef __cplusplus

diff --git a/src/analysis/vector/qgstransectsample.cpp b/src/analysis/vector/qgstransectsample.cpp
@@ -6,7 +6,9 @@
 #include "qgsvectorlayer.h"
 #include <QProgressDialog>
 #include <QFileInfo>
+#ifndef _MSC_VER
 #include <stdint.h>
+#endif
 #include "mersenne-twister.h"
 #include <limits>
 

diff --git a/src/app/gps/qgsgpsmarker.cpp b/src/app/gps/qgsgpsmarker.cpp
@@ -50,6 +50,7 @@ void QgsGpsMarker::setCenter( const QgsPoint& point )
     }
     catch ( QgsCsException &e ) //silently ignore transformation exceptions
     {
+			Q_UNUSED( e );
       return;
     }
   }

diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -55,9 +55,9 @@ QgsRendererCategoryV2& QgsRendererCategoryV2::operator=( QgsRendererCategoryV2 c
 
 void QgsRendererCategoryV2::swap( QgsRendererCategoryV2 & cat )
 {
-  std::swap( mValue, cat.mValue );
-  std::swap( mSymbol, cat.mSymbol );
-  std::swap( mLabel, cat.mLabel );
+  qSwap( mValue, cat.mValue );
+  qSwap( mSymbol, cat.mSymbol );
+  qSwap( mLabel, cat.mLabel );
 }
 
 QVariant QgsRendererCategoryV2::value() const

diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -60,9 +60,9 @@ QgsRendererRangeV2& QgsRendererRangeV2::operator=( QgsRendererRangeV2 range )
 
 void QgsRendererRangeV2::swap( QgsRendererRangeV2 & other )
 {
-  std::swap( mLowerValue, other.mLowerValue );
-  std::swap( mUpperValue, other.mUpperValue );
-  std::swap( mSymbol, other.mSymbol );
+  qSwap( mLowerValue, other.mLowerValue );
+  qSwap( mUpperValue, other.mUpperValue );
+  qSwap( mSymbol, other.mSymbol );
   std::swap( mLabel, other.mLabel );
 }
 

diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp b/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
@@ -56,12 +56,12 @@ QgsSingleSymbolRendererV2 & QgsSingleSymbolRendererV2::operator=( QgsSingleSymbo
 
 void QgsSingleSymbolRendererV2::swap( QgsSingleSymbolRendererV2 & other )
 {
-  std::swap( mSymbol, other.mSymbol );
-  std::swap( mRotation, other.mRotation );
-  std::swap( mSizeScale, other.mSizeScale );
-  std::swap( mScaleMethod, other.mScaleMethod );
-  std::swap( mTempSymbol, other.mTempSymbol );
-  std::swap( mOrigSize, other.mOrigSize );
+  qSwap( mSymbol, other.mSymbol );
+  qSwap( mRotation, other.mRotation );
+  qSwap( mSizeScale, other.mSizeScale );
+  qSwap( mScaleMethod, other.mScaleMethod );
+  qSwap( mTempSymbol, other.mTempSymbol );
+  qSwap( mOrigSize, other.mOrigSize );
 }
 
 QgsSingleSymbolRendererV2::~QgsSingleSymbolRendererV2()