Skip to content
Permalink
Browse files

Support pre-CXX11 compilers

I'll update the toolchain one day, I promise!
  • Loading branch information
m-kuhn committed Aug 31, 2016
1 parent bd3cf76 commit d5377dbc2e39bec7f73b5b284d2726f3fef1fedd
Showing with 7 additions and 2 deletions.
  1. +3 −2 CMakeLists.txt
  2. +2 −0 src/core/qgsexpressioncontext.cpp
  3. +2 −0 src/core/qgsexpressioncontext.h
@@ -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

@@ -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 )
{
@@ -259,7 +259,9 @@ class CORE_EXPORT QgsExpressionContext

QgsExpressionContext& operator=( const QgsExpressionContext& other );

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

~QgsExpressionContext();

0 comments on commit d5377db

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