diff options
-rw-r--r-- | include/llvm/Support/Compiler.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index feac9348dd45..7fd1d0648757 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -43,7 +43,10 @@ /// \brief Does the compiler support r-value references? /// This implies that <utility> provides the one-argument std::move; it /// does not imply the existence of any other C++ library features. -#if (__has_feature(cxx_rvalue_references) \ +/// On Android, the compiler can handle r-value references -- but STLport is +/// behind and doesn't implement std::move. So we have to ignore the +/// compiler's support. +#if !defined(ANDROID) && (__has_feature(cxx_rvalue_references) \ || defined(__GXX_EXPERIMENTAL_CXX0X__) \ || (defined(_MSC_VER) && _MSC_VER >= 1600)) #define LLVM_HAS_RVALUE_REFERENCES 1 |