diff options
author | Howard Hinnant <hhinnant@apple.com> | 2010-09-04 23:28:19 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2010-09-04 23:28:19 +0000 |
commit | 7609c9b665d67c9738fdd0af53ba9e8782218542 (patch) | |
tree | 79269b65cc775b7f08160aca8f688ba04e0bfe86 /libcxx/test/algorithms/alg.sorting/alg.heap.operations | |
parent | edbdff64c720d143b5ae7ace2733256b51be8bb9 (diff) | |
download | bcm5719-llvm-7609c9b665d67c9738fdd0af53ba9e8782218542.tar.gz bcm5719-llvm-7609c9b665d67c9738fdd0af53ba9e8782218542.zip |
Changed __config to react to all of clang's currently documented has_feature flags, and renamed _LIBCPP_MOVE to _LIBCPP_HAS_NO_RVALUE_REFERENCES to be more consistent with the rest of the libc++'s flags, and with clang's nomenclature.
llvm-svn: 113086
Diffstat (limited to 'libcxx/test/algorithms/alg.sorting/alg.heap.operations')
4 files changed, 16 insertions, 16 deletions
diff --git a/libcxx/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp index 70b1b81549e..1b9d6c0ab5c 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap_comp.pass.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <functional> #include <cassert> -#ifdef _LIBCPP_MOVE +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include <memory> struct indirect_less @@ -27,7 +27,7 @@ struct indirect_less {return *x < *y;} }; -#endif // _LIBCPP_MOVE +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES void test(unsigned N) { @@ -49,7 +49,7 @@ int main() test(10); test(1000); -#ifdef _LIBCPP_MOVE +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES { const int N = 1000; std::unique_ptr<int>* ia = new std::unique_ptr<int> [N]; @@ -60,5 +60,5 @@ int main() assert(std::is_heap(ia, ia+N, indirect_less())); delete [] ia; } -#endif // _LIBCPP_MOVE +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } diff --git a/libcxx/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp index cc093a54083..aeae64f25f4 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <functional> #include <cassert> -#ifdef _LIBCPP_MOVE +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include <memory> struct indirect_less @@ -27,7 +27,7 @@ struct indirect_less {return *x < *y;} }; -#endif // _LIBCPP_MOVE +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES void test(unsigned N) { @@ -49,7 +49,7 @@ int main() { test(1000); -#ifdef _LIBCPP_MOVE +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES { const int N = 1000; std::unique_ptr<int>* ia = new std::unique_ptr<int> [N]; @@ -64,5 +64,5 @@ int main() } delete [] ia; } -#endif // _LIBCPP_MOVE +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } diff --git a/libcxx/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp index 87126298bf9..132fc600953 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp @@ -18,7 +18,7 @@ #include <algorithm> #include <functional> #include <cassert> -#ifdef _LIBCPP_MOVE +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include <memory> struct indirect_less @@ -28,7 +28,7 @@ struct indirect_less {return *x < *y;} }; -#endif // _LIBCPP_MOVE +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES void test(unsigned N) { @@ -48,7 +48,7 @@ int main() { test(1000); -#ifdef _LIBCPP_MOVE +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES { const int N = 1000; std::unique_ptr<int>* ia = new std::unique_ptr<int> [N]; @@ -62,5 +62,5 @@ int main() } delete [] ia; } -#endif // _LIBCPP_MOVE +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } diff --git a/libcxx/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp b/libcxx/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp index 8cac3b6cdc7..e451e68b72d 100644 --- a/libcxx/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp +++ b/libcxx/test/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp @@ -17,7 +17,7 @@ #include <algorithm> #include <functional> #include <cassert> -#ifdef _LIBCPP_MOVE +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #include <memory> struct indirect_less @@ -27,7 +27,7 @@ struct indirect_less {return *x < *y;} }; -#endif // _LIBCPP_MOVE +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES void test(unsigned N) { @@ -50,7 +50,7 @@ int main() test(10); test(1000); -#ifdef _LIBCPP_MOVE +#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES { const int N = 1000; std::unique_ptr<int>* ia = new std::unique_ptr<int> [N]; @@ -62,5 +62,5 @@ int main() assert(std::is_sorted(ia, ia+N, indirect_less())); delete [] ia; } -#endif // _LIBCPP_MOVE +#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } |