Added a conditional move on return if CXX 11 for polymorphic unique_pointers

This commit is contained in:
Paul Fd 2020-03-14 22:54:19 +01:00
parent a6df5d9526
commit d2af3eaf8d
3 changed files with 6 additions and 2 deletions

View file

@ -20,6 +20,9 @@
#if __cplusplus > 201103L #if __cplusplus > 201103L
#define CXX14_CONSTEXPR constexpr #define CXX14_CONSTEXPR constexpr
#define CXX11_MOVE(x) x
#else #else
#define CXX14_CONSTEXPR #define CXX14_CONSTEXPR
#define CXX11_MOVE(x) std::move(x)
#endif #endif

View file

@ -21,6 +21,7 @@
*/ */
#include "Apan.h" #include "Apan.h"
#include "Macros.h"
#include "CommonLFO.h" #include "CommonLFO.h"
#include "Opcode.h" #include "Opcode.h"
#include <limits> #include <limits>
@ -108,7 +109,7 @@ namespace fx {
} }
} }
return fx; return CXX11_MOVE(fx);
} }
void Apan::computeLfos(float* left, float* right, unsigned nframes) void Apan::computeLfos(float* left, float* right, unsigned nframes)

View file

@ -92,7 +92,7 @@ namespace fx {
} }
} }
return std::move(fx); return CXX11_MOVE(fx);
} }
/// ///