Support pre-CXX11 compilers

I'll update the toolchain one day, I promise!
qgis · Aug 31, 2016 · d5377db · d5377db
1 parent bd3cf76
commit d5377db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -391,13 +391,14 @@ ELSE()
 ENDIF()
 
 #allow override keyword if available
-IF (NOT USE_CXX_11)
+IF(NOT USE_CXX_11)
   ADD_DEFINITIONS("-Doverride=")
   ADD_DEFINITIONS("-Dnoexcept=")
   ADD_DEFINITIONS("-Dnullptr=0")
+ELSE()
+  ADD_DEFINITIONS("-DHAS_MOVE_SEMANTICS")
 ENDIF()
 
-
 #############################################################
 # enable warnings
 

diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -217,6 +217,7 @@ QgsExpressionContext::QgsExpressionContext( const QgsExpressionContext& other )
   mCachedValues = other.mCachedValues;
 }
 
+#ifdef HAS_MOVE_SEMANTICS
 QgsExpressionContext& QgsExpressionContext::operator=( QgsExpressionContext && other )
 {
   if ( this != &other )
@@ -231,6 +232,7 @@ QgsExpressionContext& QgsExpressionContext::operator=( QgsExpressionContext && o
   }
   return *this;
 }
+#endif
 
 QgsExpressionContext& QgsExpressionContext::operator=( const QgsExpressionContext & other )
 {

diff --git a/src/core/qgsexpressioncontext.h b/src/core/qgsexpressioncontext.h
@@ -259,7 +259,9 @@ class CORE_EXPORT QgsExpressionContext
 
     QgsExpressionContext& operator=( const QgsExpressionContext& other );
 
+#ifdef HAS_MOVE_SEMANTICS
     QgsExpressionContext& operator=( QgsExpressionContext && other );
+#endif
 
     ~QgsExpressionContext();