fix windows build

jef-n · jef-n · commit 0a942fd92d46 · 2017-05-13T13:59:17.000+02:00
diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp
@@ -708,15 +708,16 @@ class ExpressionContextScopePopper
 {
   public:
 
-    ExpressionContextScopePopper() = default;
+    ExpressionContextScopePopper() : context( nullptr )
+    {}
 
     ~ExpressionContextScopePopper()
     {
       if ( context )
         context->popScope();
     }
 
-    QgsExpressionContext *context = nullptr;
+    QgsExpressionContext *context;
 };
 ///@endcond PRIVATE
 
@@ -1154,10 +1155,10 @@ QgsMarkerSymbolV2::QgsMarkerSymbolV2( const QgsSymbolLayerV2List& layers )
     mLayers.append( new QgsSimpleMarkerSymbolLayerV2() );
 }
 
-void QgsMarkerSymbolV2::setAngle( double ang )
+void QgsMarkerSymbolV2::setAngle( double angle0 )
 {
   double origAngle = angle();
-  double angleDiff = ang - origAngle;
+  double angleDiff = angle0 - origAngle;
   Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
   {
     QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast<QgsMarkerSymbolLayerV2*>( layer );

Original file line number	Diff line number	Diff line change
`@@ -708,15 +708,16 @@ class ExpressionContextScopePopper`
`708`	`708`	`{`
`709`	`709`	`public:`
`710`	`710`
`711`		`- ExpressionContextScopePopper() = default;`
	`711`	`+ ExpressionContextScopePopper() : context( nullptr )`
	`712`	`+ {}`
`712`	`713`
`713`	`714`	`~ExpressionContextScopePopper()`
`714`	`715`	`{`
`715`	`716`	`if ( context )`
`716`	`717`	`context->popScope();`
`717`	`718`	`}`
`718`	`719`
`719`		`- QgsExpressionContext *context = nullptr;`
	`720`	`+ QgsExpressionContext *context;`
`720`	`721`	`};`
`721`	`722`	`///@endcond PRIVATE`
`722`	`723`
`@@ -1154,10 +1155,10 @@ QgsMarkerSymbolV2::QgsMarkerSymbolV2( const QgsSymbolLayerV2List& layers )`
`1154`	`1155`	`mLayers.append( new QgsSimpleMarkerSymbolLayerV2() );`
`1155`	`1156`	`}`
`1156`	`1157`
`1157`		`-void QgsMarkerSymbolV2::setAngle( double ang )`
	`1158`	`+void QgsMarkerSymbolV2::setAngle( double angle0 )`
`1158`	`1159`	`{`
`1159`	`1160`	`double origAngle = angle();`
`1160`		`- double angleDiff = ang - origAngle;`
	`1161`	`+ double angleDiff = angle0 - origAngle;`
`1161`	`1162`	`Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )`
`1162`	`1163`	`{`
`1163`	`1164`	`QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast<QgsMarkerSymbolLayerV2*>( layer );`