Cleanup _LIBCPP_HAS_NO_<c++11-feature> in support headers and final tests

llvm-svn: 300637

1 files changed, 4 insertions, 2 deletions

diff --git a/libcxx/test/support/tracked_value.h b/libcxx/test/support/tracked_value.h
index 14d96b88368..6b75516e627 100644
--- a/libcxx/test/support/tracked_value.h
+++ b/libcxx/test/support/tracked_value.h
@@ -11,6 +11,8 @@
 
 #include <cassert>
 
+#include "test_macros.h"
+
 struct TrackedValue {
     enum State { CONSTRUCTED, MOVED_FROM, DESTROYED };
     State state;
@@ -22,7 +24,7 @@ struct TrackedValue {
         assert(t.state != State::DESTROYED  && "copying a destroyed object");
     }
 
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#if TEST_STD_VER >= 11
     TrackedValue(TrackedValue&& t) : state(State::CONSTRUCTED) {
         assert(t.state != State::MOVED_FROM && "double moving from an object");
         assert(t.state != State::DESTROYED  && "moving from a destroyed object");
@@ -38,7 +40,7 @@ struct TrackedValue {
         return *this;
     }
 
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#if TEST_STD_VER >= 11
     TrackedValue& operator=(TrackedValue&& t) {
         assert(state != State::DESTROYED && "move assigning into destroyed object");
         assert(t.state != State::MOVED_FROM && "double moving from an object");