Skip to content
Permalink
Browse files

Followup a6a4f2e: clean pre-cxx-11 garbage

  • Loading branch information
m-kuhn committed Oct 20, 2016
1 parent 9bab3fa commit fba53db7857b014498a2c6ae1f7040ed9e7af03b
Showing with 0 additions and 14 deletions.
  1. +0 −10 CMakeLists.txt
  2. +0 −2 src/core/qgsexpressioncontext.cpp
  3. +0 −2 src/core/qgsexpressioncontext.h
@@ -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
@@ -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 )
{
@@ -264,9 +264,7 @@ class CORE_EXPORT QgsExpressionContext

QgsExpressionContext& operator=( const QgsExpressionContext& other );

#ifdef HAS_MOVE_SEMANTICS
QgsExpressionContext& operator=( QgsExpressionContext && other );
#endif

~QgsExpressionContext();

0 comments on commit fba53db

Please sign in to comment.
You can’t perform that action at this time.