sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Followup a6a4f2ed: clean pre-cxx-11 garbage

Browse Source
This commit is contained in:
Matthias Kuhn 2016-10-20 14:55:18 +02:00
parent 9bab3fa305
commit fba53db785
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -347,16 +347,6 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
# https://gist.github.com/yamaya/2924292 # https://gist.github.com/yamaya/2924292
SET(CMAKE_CXX_STANDARD 11) 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 # enable warnings

2
src/core/qgsexpressioncontext.cpp
View File

@ -219,7 +219,6 @@ QgsExpressionContext::QgsExpressionContext( const QgsExpressionContext& other )
mCachedValues = other.mCachedValues; mCachedValues = other.mCachedValues;
} }
#ifdef HAS_MOVE_SEMANTICS
QgsExpressionContext& QgsExpressionContext::operator=( QgsExpressionContext && other ) QgsExpressionContext& QgsExpressionContext::operator=( QgsExpressionContext && other )
{ {
if ( this != &other ) if ( this != &other )
@ -234,7 +233,6 @@ QgsExpressionContext& QgsExpressionContext::operator=( QgsExpressionContext && o
} }
return *this; return *this;
} }
#endif
QgsExpressionContext& QgsExpressionContext::operator=( const QgsExpressionContext & other ) QgsExpressionContext& QgsExpressionContext::operator=( const QgsExpressionContext & other )
{ {

2
src/core/qgsexpressioncontext.h
View File

@ -264,9 +264,7 @@ class CORE_EXPORT QgsExpressionContext
QgsExpressionContext& operator=( const QgsExpressionContext& other ); QgsExpressionContext& operator=( const QgsExpressionContext& other );
#ifdef HAS_MOVE_SEMANTICS
QgsExpressionContext& operator=( QgsExpressionContext && other ); QgsExpressionContext& operator=( QgsExpressionContext && other );
#endif
~QgsExpressionContext(); ~QgsExpressionContext();