[libcxx-commits] [libcxx] 37ef151 - [libcxx] Fix C++14 and up constexpr members in MoveOnly.

[via libcxx-commits]

Author: zoecarver
Date: 2020-05-25T11:38:24-07:00
New Revision: 37ef15143a5d77a0fba0ece4c26a72cfb9e050a0

URL: https://github.com/llvm/llvm-project/commit/37ef15143a5d77a0fba0ece4c26a72cfb9e050a0
DIFF: https://github.com/llvm/llvm-project/commit/37ef15143a5d77a0fba0ece4c26a72cfb9e050a0.diff

LOG: [libcxx] Fix C++14 and up constexpr members in MoveOnly.

Summary: a4b8ee6 made all MoveOnly members constexpr but, some members and constructors contain expressions that are only valid in C++14 and later. This patch prefixes those methods and constructors with TEST_CONSTEXPR_CXX14.

Reviewers: ldionne, #libc!

Subscribers: dexonsmith, libcxx-commits

Tags: #libc

Differential Revision: https://reviews.llvm.org/D80482

Added: 
    

Modified: 
    libcxx/test/support/MoveOnly.h

Removed: 
    


################################################################################
diff  --git a/libcxx/test/support/MoveOnly.h b/libcxx/test/support/MoveOnly.h
index f9e9298097f1..adcae2542bd3 100644
--- a/libcxx/test/support/MoveOnly.h
+++ b/libcxx/test/support/MoveOnly.h
@@ -24,17 +24,19 @@ class MoveOnly
     int data_;
 public:
     constexpr MoveOnly(int data = 1) : data_(data) {}
-    constexpr MoveOnly(MoveOnly&& x)
+    TEST_CONSTEXPR_CXX14 MoveOnly(MoveOnly&& x)
         : data_(x.data_) {x.data_ = 0;}
-    constexpr MoveOnly& operator=(MoveOnly&& x)
+    TEST_CONSTEXPR_CXX14 MoveOnly& operator=(MoveOnly&& x)
         {data_ = x.data_; x.data_ = 0; return *this;}
 
     constexpr int get() const {return data_;}
 
     constexpr bool operator==(const MoveOnly& x) const {return data_ == x.data_;}
     constexpr bool operator< (const MoveOnly& x) const {return data_ <  x.data_;}
-    constexpr MoveOnly operator+(const MoveOnly& x) const { return MoveOnly{data_ + x.data_}; }
-    constexpr MoveOnly operator*(const MoveOnly& x) const { return MoveOnly{data_ * x.data_}; }
+    TEST_CONSTEXPR_CXX14 MoveOnly operator+(const MoveOnly& x) const
+        { return MoveOnly{data_ + x.data_}; }
+    TEST_CONSTEXPR_CXX14 MoveOnly operator*(const MoveOnly& x) const
+        { return MoveOnly{data_ * x.data_}; }
 };
 
 namespace std {