From 99f15d6eb77f1719cd38d2199b5b6a3b24f649d0 Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Thu, 19 Apr 2012 00:50:47 +0000
Subject: [PATCH] libc++: Add some missing #includes to atomics tests. libc++
 doesn't need these at the moment, but they allow these tests to be used to
 test clang against libstdc++. Add myself to the credits file, as suggested by
 Howard.

llvm-svn: 155085
---
 libcxx/CREDITS.TXT                                             | 3 +++
 libcxx/test/atomics/atomics.types.generic/address.pass.cpp     | 1 +
 .../atomics/atomics.types.generic/cstdint_typedefs.pass.cpp    | 1 +
 .../atomic_compare_exchange_strong.pass.cpp                    | 1 +
 .../atomic_compare_exchange_strong_explicit.pass.cpp           | 1 +
 .../atomic_compare_exchange_weak.pass.cpp                      | 1 +
 .../atomic_compare_exchange_weak_explicit.pass.cpp             | 1 +
 .../atomics.types.operations.req/atomic_exchange.pass.cpp      | 1 +
 .../atomic_exchange_explicit.pass.cpp                          | 1 +
 .../atomics.types.operations.req/atomic_fetch_add.pass.cpp     | 1 +
 .../atomic_fetch_add_explicit.pass.cpp                         | 1 +
 .../atomics.types.operations.req/atomic_fetch_and.pass.cpp     | 1 +
 .../atomic_fetch_and_explicit.pass.cpp                         | 1 +
 .../atomics.types.operations.req/atomic_fetch_or.pass.cpp      | 1 +
 .../atomic_fetch_or_explicit.pass.cpp                          | 1 +
 .../atomics.types.operations.req/atomic_fetch_sub.pass.cpp     | 1 +
 .../atomic_fetch_sub_explicit.pass.cpp                         | 1 +
 .../atomics.types.operations.req/atomic_fetch_xor.pass.cpp     | 1 +
 .../atomic_fetch_xor_explicit.pass.cpp                         | 1 +
 .../atomics.types.operations.req/atomic_init.pass.cpp          | 1 +
 .../atomics.types.operations.req/atomic_load.pass.cpp          | 1 +
 .../atomics.types.operations.req/atomic_load_explicit.pass.cpp | 1 +
 .../atomics.types.operations.req/atomic_store.pass.cpp         | 1 +
 .../atomic_store_explicit.pass.cpp                             | 1 +
 .../atomics.types.operations.req/atomic_var_init.pass.cpp      | 1 +
 libcxx/test/testit                                             | 2 +-
 26 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/libcxx/CREDITS.TXT b/libcxx/CREDITS.TXT
index 408cda317475..937412433a45 100644
--- a/libcxx/CREDITS.TXT
+++ b/libcxx/CREDITS.TXT
@@ -47,3 +47,6 @@ D: Linux fixes.
 
 N: Jonathan Sauer
 D: Minor patches, mostly related to constexpr
+
+N: Richard Smith
+D: Minor patches.
diff --git a/libcxx/test/atomics/atomics.types.generic/address.pass.cpp b/libcxx/test/atomics/atomics.types.generic/address.pass.cpp
index b43959b4d571..1cfdef501ae8 100644
--- a/libcxx/test/atomics/atomics.types.generic/address.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.generic/address.pass.cpp
@@ -66,6 +66,7 @@
 // };
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class A, class T>
diff --git a/libcxx/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp b/libcxx/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
index 0ce127daf20e..eac51777dc5e 100644
--- a/libcxx/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.generic/cstdint_typedefs.pass.cpp
@@ -36,6 +36,7 @@
 
 #include <atomic>
 #include <type_traits>
+#include <cstdint>
 
 int main()
 {
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
index 2223de155116..fd5102bb9ac5 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_compare_exchange_strong(atomic<T>* obj, T* expc, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
index bc37ac45b9af..f2610a3ec745 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_strong_explicit.pass.cpp
@@ -21,6 +21,7 @@
 //                                           memory_order s, memory_order f);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
index 56ba572b7aa9..a3f95a487b70 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_compare_exchange_weak(atomic<T>* obj, T* expc, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
index b3a804b7d1d2..2f3e996572bb 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_compare_exchange_weak_explicit.pass.cpp
@@ -21,6 +21,7 @@
 //                                           memory_order s, memory_order f);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
index 61bf812ba455..426494351a96 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_exchange(atomic<T>* obj, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
index 5c2d77fee1c6..0f3add563070 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_exchange_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_exchange_explicit(atomic<T>* obj, T desr, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
index 4b1a491bbcd6..9ce60adb0c63 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add.pass.cpp
@@ -26,6 +26,7 @@
 //     atomic_fetch_add(atomic<T*>* obj, ptrdiff_t op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
index ce960945c3ba..a2a1a4479cea 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_add_explicit.pass.cpp
@@ -26,6 +26,7 @@
 //     atomic_fetch_add_explicit(atomic<T*>* obj, ptrdiff_t op, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
index a62335c89405..01d2cc6d361b 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_and(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
index 87f091b3dc74..abfb83db1c8f 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_and_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_and_explicit(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
index 8a931e9e14ec..43b6c4f3330c 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_or(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
index fbd5700fec7f..21078bbfff8b 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_or_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_or_explicit(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
index 27086a51e176..d33b81efe0d5 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub.pass.cpp
@@ -26,6 +26,7 @@
 //     atomic_fetch_sub(atomic<T*>* obj, ptrdiff_t op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
index 62128f32d63a..886a65f783a9 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_sub_explicit.pass.cpp
@@ -27,6 +27,7 @@
 //     atomic_fetch_sub_explicit(atomic<T*>* obj, ptrdiff_t op, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
index 118f04820a2c..78120a76c1cf 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_xor(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
index 6e5427718617..0a0cd154ccdd 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_fetch_xor_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_fetch_xor_explicit(atomic<Integral>* obj, Integral op);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
index 09adb54496f1..f0d9a2418507 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_init.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_init(atomic<T>* obj, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
index 1a9c652ca75d..b23988602273 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_load(const atomic<T>* obj);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
index d3557a4d9dd2..3072dd581db2 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_load_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_load_explicit(const atomic<T>* obj, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
index 5926ec0f689b..f9044bf14daa 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_store(atomic<T>* obj, T desr);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
index dfa00cfca974..18038ae0cb68 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_store_explicit.pass.cpp
@@ -18,6 +18,7 @@
 //     atomic_store_explicit(atomic<T>* obj, T desr, memory_order m);
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 template <class T>
diff --git a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
index 05b335f71f64..6758c7bb5eb8 100644
--- a/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
+++ b/libcxx/test/atomics/atomics.types.operations/atomics.types.operations.req/atomic_var_init.pass.cpp
@@ -12,6 +12,7 @@
 // #define ATOMIC_VAR_INIT(value)
 
 #include <atomic>
+#include <type_traits>
 #include <cassert>
 
 int main()
diff --git a/libcxx/test/testit b/libcxx/test/testit
index c7409160f822..eea3858a628a 100755
--- a/libcxx/test/testit
+++ b/libcxx/test/testit
@@ -8,7 +8,7 @@
 # //
 # //===--------------------------------------------------------------------===//
 
-if [ -z $CC ]
+if [ -z "$CC" ]
 then
 	if which xcrun >/dev/null
 	then