fix windows build

qgis · May 13, 2017 · 0a942fd · 0a942fd
1 parent 43595f5
commit 0a942fd
Showing 1 changed file with 5 additions and 4 deletions.
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 );