Followup a6a4f2e: clean pre-cxx-11 garbage

qgis · Oct 20, 2016 · fba53db · fba53db
1 parent 9bab3fa
commit fba53db
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -347,16 +347,6 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
 #   https://gist.github.com/yamaya/2924292
 
 SET(CMAKE_CXX_STANDARD 11)
-SET(USE_CXX_11 TRUE)
-
-#allow override keyword if available
-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
@@ -219,7 +219,6 @@ QgsExpressionContext::QgsExpressionContext( const QgsExpressionContext& other )
   mCachedValues = other.mCachedValues;
 }
 
-#ifdef HAS_MOVE_SEMANTICS
 QgsExpressionContext& QgsExpressionContext::operator=( QgsExpressionContext && other )
 {
   if ( this != &other )
@@ -234,7 +233,6 @@ 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
@@ -264,9 +264,7 @@ class CORE_EXPORT QgsExpressionContext
 
     QgsExpressionContext& operator=( const QgsExpressionContext& other );
 
-#ifdef HAS_MOVE_SEMANTICS
     QgsExpressionContext& operator=( QgsExpressionContext && other );
-#endif
 
     ~QgsExpressionContext();