File tree 3 files changed +7
-2
lines changed
3 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -391,13 +391,14 @@ ELSE()
391
391
ENDIF ()
392
392
393
393
#allow override keyword if available
394
- IF (NOT USE_CXX_11)
394
+ IF (NOT USE_CXX_11)
395
395
ADD_DEFINITIONS ("-Doverride=" )
396
396
ADD_DEFINITIONS ("-Dnoexcept=" )
397
397
ADD_DEFINITIONS ("-Dnullptr=0" )
398
+ ELSE ()
399
+ ADD_DEFINITIONS ("-DHAS_MOVE_SEMANTICS" )
398
400
ENDIF ()
399
401
400
-
401
402
#############################################################
402
403
# enable warnings
403
404
Original file line number Diff line number Diff line change @@ -217,6 +217,7 @@ QgsExpressionContext::QgsExpressionContext( const QgsExpressionContext& other )
217
217
mCachedValues = other.mCachedValues ;
218
218
}
219
219
220
+ #ifdef HAS_MOVE_SEMANTICS
220
221
QgsExpressionContext& QgsExpressionContext::operator =( QgsExpressionContext && other )
221
222
{
222
223
if ( this != &other )
@@ -231,6 +232,7 @@ QgsExpressionContext& QgsExpressionContext::operator=( QgsExpressionContext && o
231
232
}
232
233
return *this ;
233
234
}
235
+ #endif
234
236
235
237
QgsExpressionContext& QgsExpressionContext::operator =( const QgsExpressionContext & other )
236
238
{
Original file line number Diff line number Diff line change @@ -259,7 +259,9 @@ class CORE_EXPORT QgsExpressionContext
259
259
260
260
QgsExpressionContext& operator =( const QgsExpressionContext& other );
261
261
262
+ #ifdef HAS_MOVE_SEMANTICS
262
263
QgsExpressionContext& operator =( QgsExpressionContext && other );
264
+ #endif
263
265
264
266
~QgsExpressionContext ();
265
267
You can’t perform that action at this time.
0 commit comments