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

Support pre-CXX11 compilers

Browse Source 
I'll update the toolchain one day, I promise!
This commit is contained in:
Matthias Kuhn 2016-08-31 17:54:28 +02:00
parent bd3cf76f5f
commit d5377dbc2e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -391,13 +391,14 @@ ELSE()
ENDIF() ENDIF()
#allow override keyword if available #allow override keyword if available
IF (NOT USE_CXX_11) IF(NOT USE_CXX_11)
ADD_DEFINITIONS("-Doverride=") ADD_DEFINITIONS("-Doverride=")
ADD_DEFINITIONS("-Dnoexcept=") ADD_DEFINITIONS("-Dnoexcept=")
ADD_DEFINITIONS("-Dnullptr=0") ADD_DEFINITIONS("-Dnullptr=0")
ELSE()
ADD_DEFINITIONS("-DHAS_MOVE_SEMANTICS")
ENDIF() ENDIF()
############################################################# #############################################################
# enable warnings # enable warnings

2
src/core/qgsexpressioncontext.cpp
View File

@ -217,6 +217,7 @@ 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 )
@ -231,6 +232,7 @@ 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

@ -259,7 +259,9 @@ 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();