From 1b18a48e280f039560e772befed75b30413a455a Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Wed, 8 Dec 2010 20:09:09 +0000 Subject: [PATCH] cleaning up... git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@121275 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../pointer_to_binary_function.pass.cpp | 0 .../pointer_to_unary_function.pass.cpp | 0 .../ptr_fun1.pass.cpp | 0 .../ptr_fun2.pass.cpp | 0 .../const_mem_fun.pass.cpp | 0 .../const_mem_fun1.pass.cpp | 0 .../const_mem_fun1_ref_t.pass.cpp | 0 .../const_mem_fun1_t.pass.cpp | 0 .../const_mem_fun_ref.pass.cpp | 0 .../const_mem_fun_ref1.pass.cpp | 0 .../const_mem_fun_ref_t.pass.cpp | 0 .../const_mem_fun_t.pass.cpp | 0 .../mem_fun.pass.cpp | 0 .../mem_fun1.pass.cpp | 0 .../mem_fun1_ref_t.pass.cpp | 0 .../mem_fun1_t.pass.cpp | 0 .../mem_fun_ref.pass.cpp | 0 .../mem_fun_ref1.pass.cpp | 0 .../mem_fun_ref_t.pass.cpp | 0 .../mem_fun_t.pass.cpp | 0 .../nothing_to_do.pass.cpp | 0 .../depr.base/binary_function.pass.cpp | 28 +++++++++++++++++++ .../depr.base/unary_function.pass.cpp | 26 +++++++++++++++++ .../nothing_to_do.pass.cpp} | 8 ------ 24 files changed, 54 insertions(+), 8 deletions(-) rename test/{utilities/function.objects/function.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors}/pointer_to_binary_function.pass.cpp (100%) rename test/{utilities/function.objects/function.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors}/pointer_to_unary_function.pass.cpp (100%) rename test/{utilities/function.objects/function.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors}/ptr_fun1.pass.cpp (100%) rename test/{utilities/function.objects/function.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors}/ptr_fun2.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/const_mem_fun.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/const_mem_fun1.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/const_mem_fun1_ref_t.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/const_mem_fun1_t.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/const_mem_fun_ref.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/const_mem_fun_ref1.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/const_mem_fun_ref_t.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/const_mem_fun_t.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/mem_fun.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/mem_fun1.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/mem_fun1_ref_t.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/mem_fun1_t.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/mem_fun_ref.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/mem_fun_ref1.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/mem_fun_ref_t.pass.cpp (100%) rename test/{utilities/function.objects/member.pointer.adaptors => depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors}/mem_fun_t.pass.cpp (100%) rename test/depr/depr.function.objects/{depr.base => depr.adaptors}/nothing_to_do.pass.cpp (100%) create mode 100644 test/depr/depr.function.objects/depr.base/binary_function.pass.cpp create mode 100644 test/depr/depr.function.objects/depr.base/unary_function.pass.cpp rename test/{utilities/function.objects/version.pass.cpp => depr/depr.function.objects/nothing_to_do.pass.cpp} (77%) diff --git a/test/utilities/function.objects/function.pointer.adaptors/pointer_to_binary_function.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.pass.cpp similarity index 100% rename from test/utilities/function.objects/function.pointer.adaptors/pointer_to_binary_function.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.pass.cpp diff --git a/test/utilities/function.objects/function.pointer.adaptors/pointer_to_unary_function.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.pass.cpp similarity index 100% rename from test/utilities/function.objects/function.pointer.adaptors/pointer_to_unary_function.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.pass.cpp diff --git a/test/utilities/function.objects/function.pointer.adaptors/ptr_fun1.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.pass.cpp similarity index 100% rename from test/utilities/function.objects/function.pointer.adaptors/ptr_fun1.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.pass.cpp diff --git a/test/utilities/function.objects/function.pointer.adaptors/ptr_fun2.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.pass.cpp similarity index 100% rename from test/utilities/function.objects/function.pointer.adaptors/ptr_fun2.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/const_mem_fun.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/const_mem_fun.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/const_mem_fun1.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/const_mem_fun1.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/const_mem_fun1_ref_t.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/const_mem_fun1_ref_t.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/const_mem_fun1_t.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/const_mem_fun1_t.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/const_mem_fun_ref.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/const_mem_fun_ref.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/const_mem_fun_ref1.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/const_mem_fun_ref1.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/const_mem_fun_ref_t.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/const_mem_fun_ref_t.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/const_mem_fun_t.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/const_mem_fun_t.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/mem_fun.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/mem_fun.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/mem_fun1.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/mem_fun1.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/mem_fun1_ref_t.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/mem_fun1_ref_t.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/mem_fun1_t.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/mem_fun1_t.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/mem_fun_ref.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/mem_fun_ref.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/mem_fun_ref1.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/mem_fun_ref1.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/mem_fun_ref_t.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/mem_fun_ref_t.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.pass.cpp diff --git a/test/utilities/function.objects/member.pointer.adaptors/mem_fun_t.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.pass.cpp similarity index 100% rename from test/utilities/function.objects/member.pointer.adaptors/mem_fun_t.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.pass.cpp diff --git a/test/depr/depr.function.objects/depr.base/nothing_to_do.pass.cpp b/test/depr/depr.function.objects/depr.adaptors/nothing_to_do.pass.cpp similarity index 100% rename from test/depr/depr.function.objects/depr.base/nothing_to_do.pass.cpp rename to test/depr/depr.function.objects/depr.adaptors/nothing_to_do.pass.cpp diff --git a/test/depr/depr.function.objects/depr.base/binary_function.pass.cpp b/test/depr/depr.function.objects/depr.base/binary_function.pass.cpp new file mode 100644 index 000000000..ddca8fdd6 --- /dev/null +++ b/test/depr/depr.function.objects/depr.base/binary_function.pass.cpp @@ -0,0 +1,28 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template +// struct binary_function +// { +// typedef Arg1 first_argument_type; +// typedef Arg2 second_argument_type; +// typedef Result result_type; +// }; + +#include +#include + +int main() +{ + static_assert((std::is_same::first_argument_type, int>::value), ""); + static_assert((std::is_same::second_argument_type, unsigned>::value), ""); + static_assert((std::is_same::result_type, char>::value), ""); +} diff --git a/test/depr/depr.function.objects/depr.base/unary_function.pass.cpp b/test/depr/depr.function.objects/depr.base/unary_function.pass.cpp new file mode 100644 index 000000000..87cfe09a3 --- /dev/null +++ b/test/depr/depr.function.objects/depr.base/unary_function.pass.cpp @@ -0,0 +1,26 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// template +// struct unary_function +// { +// typedef Arg argument_type; +// typedef Result result_type; +// }; + +#include +#include + +int main() +{ + static_assert((std::is_same::argument_type, unsigned>::value), ""); + static_assert((std::is_same::result_type, char>::value), ""); +} diff --git a/test/utilities/function.objects/version.pass.cpp b/test/depr/depr.function.objects/nothing_to_do.pass.cpp similarity index 77% rename from test/utilities/function.objects/version.pass.cpp rename to test/depr/depr.function.objects/nothing_to_do.pass.cpp index 99d731a74..b58f5c55b 100644 --- a/test/utilities/function.objects/version.pass.cpp +++ b/test/depr/depr.function.objects/nothing_to_do.pass.cpp @@ -7,14 +7,6 @@ // //===----------------------------------------------------------------------===// -// - -#include - -#ifndef _LIBCPP_VERSION -#error _LIBCPP_VERSION not defined -#endif - int main() { }