Skip to content

Commit a78a003

Browse files
committed
fix windows build (fixes #9416)
1 parent 2a1ef13 commit a78a003

7 files changed

+22
-13
lines changed

src/analysis/vector/mersenne-twister.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
*/
2222

2323
#include <stdio.h>
24-
#include <stdint.h>
2524
#include "mersenne-twister.h"
2625

2726
/*

src/analysis/vector/mersenne-twister.h

+7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,14 @@
2222
#ifndef MERSENNE_TWISTER_H
2323
#define MERSENNE_TWISTER_H
2424

25+
#ifndef _MSC_VER
2526
#include <stdint.h>
27+
#else
28+
typedef __int32 int32_t;
29+
typedef unsigned __int32 uint32_t;
30+
typedef __int64 int64_t;
31+
typedef unsigned __int64 uint64_t;
32+
#endif
2633
#include <limits>
2734

2835
#ifdef __cplusplus

src/analysis/vector/qgstransectsample.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
#include "qgsvectorlayer.h"
77
#include <QProgressDialog>
88
#include <QFileInfo>
9+
#ifndef _MSC_VER
910
#include <stdint.h>
11+
#endif
1012
#include "mersenne-twister.h"
1113
#include <limits>
1214

src/app/gps/qgsgpsmarker.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ void QgsGpsMarker::setCenter( const QgsPoint& point )
5050
}
5151
catch ( QgsCsException &e ) //silently ignore transformation exceptions
5252
{
53+
Q_UNUSED( e );
5354
return;
5455
}
5556
}

src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ QgsRendererCategoryV2& QgsRendererCategoryV2::operator=( QgsRendererCategoryV2 c
5555

5656
void QgsRendererCategoryV2::swap( QgsRendererCategoryV2 & cat )
5757
{
58-
std::swap( mValue, cat.mValue );
59-
std::swap( mSymbol, cat.mSymbol );
60-
std::swap( mLabel, cat.mLabel );
58+
qSwap( mValue, cat.mValue );
59+
qSwap( mSymbol, cat.mSymbol );
60+
qSwap( mLabel, cat.mLabel );
6161
}
6262

6363
QVariant QgsRendererCategoryV2::value() const

src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ QgsRendererRangeV2& QgsRendererRangeV2::operator=( QgsRendererRangeV2 range )
6060

6161
void QgsRendererRangeV2::swap( QgsRendererRangeV2 & other )
6262
{
63-
std::swap( mLowerValue, other.mLowerValue );
64-
std::swap( mUpperValue, other.mUpperValue );
65-
std::swap( mSymbol, other.mSymbol );
63+
qSwap( mLowerValue, other.mLowerValue );
64+
qSwap( mUpperValue, other.mUpperValue );
65+
qSwap( mSymbol, other.mSymbol );
6666
std::swap( mLabel, other.mLabel );
6767
}
6868

src/core/symbology-ng/qgssinglesymbolrendererv2.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ QgsSingleSymbolRendererV2 & QgsSingleSymbolRendererV2::operator=( QgsSingleSymbo
5656

5757
void QgsSingleSymbolRendererV2::swap( QgsSingleSymbolRendererV2 & other )
5858
{
59-
std::swap( mSymbol, other.mSymbol );
60-
std::swap( mRotation, other.mRotation );
61-
std::swap( mSizeScale, other.mSizeScale );
62-
std::swap( mScaleMethod, other.mScaleMethod );
63-
std::swap( mTempSymbol, other.mTempSymbol );
64-
std::swap( mOrigSize, other.mOrigSize );
59+
qSwap( mSymbol, other.mSymbol );
60+
qSwap( mRotation, other.mRotation );
61+
qSwap( mSizeScale, other.mSizeScale );
62+
qSwap( mScaleMethod, other.mScaleMethod );
63+
qSwap( mTempSymbol, other.mTempSymbol );
64+
qSwap( mOrigSize, other.mOrigSize );
6565
}
6666

6767
QgsSingleSymbolRendererV2::~QgsSingleSymbolRendererV2()

0 commit comments

Comments
 (0)