Implement http://wg21.link/p0302r1: Removing Allocator Support in std::function. These functions never worked, and as far as I know, no one ever called them.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@284164 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// UNSUPPORTED: c++98, c++03
|
||||
// XFAIL: c++11, c++14
|
||||
|
||||
// <functional>
|
||||
|
||||
#include <functional>
|
||||
#include <type_traits>
|
||||
|
||||
#include "test_macros.h"
|
||||
|
||||
struct S : public std::function<void()> { using function::function; };
|
||||
|
||||
int main() {
|
||||
S f1( [](){} );
|
||||
S f2(std::allocator_arg, std::allocator<int>{}, f1);
|
||||
}
|
||||
@@ -8,6 +8,7 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// UNSUPPORTED: c++98, c++03
|
||||
// REQUIRES-ANY: c++11, c++14
|
||||
|
||||
// <functional>
|
||||
|
||||
@@ -16,6 +17,8 @@
|
||||
#include <functional>
|
||||
#include <type_traits>
|
||||
|
||||
#include "test_macros.h"
|
||||
|
||||
using Fn = std::function<void()>;
|
||||
struct S : public std::function<void()> { using function::function; };
|
||||
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// XFAIL: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
// template<class A> function(allocator_arg_t, const A&);
|
||||
|
||||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "min_allocator.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
std::function<int(int)> f(std::allocator_arg, std::allocator<int>());
|
||||
}
|
||||
@@ -8,10 +8,13 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// REQUIRES-ANY: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
// template<class A> function(allocator_arg_t, const A&);
|
||||
//
|
||||
// This signature was removed in C++17
|
||||
|
||||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// XFAIL: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
// template<class F, class A> function(allocator_arg_t, const A&, F);
|
||||
//
|
||||
// This signature was removed in C++17
|
||||
|
||||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "test_macros.h"
|
||||
|
||||
void foo(int) {}
|
||||
|
||||
int main()
|
||||
{
|
||||
std::function<void(int)> f(std::allocator_arg, std::allocator<int>(), foo);
|
||||
}
|
||||
@@ -8,6 +8,7 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// REQUIRES-ANY: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// XFAIL: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
// template<class A> function(allocator_arg_t, const A&, const function&);
|
||||
//
|
||||
// This signature was removed in C++17
|
||||
|
||||
|
||||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "test_macros.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
typedef std::function<void(int)> F;
|
||||
F f1;
|
||||
F f2(std::allocator_arg, std::allocator<int>(), f1);
|
||||
}
|
||||
@@ -8,6 +8,7 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// REQUIRES-ANY: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// XFAIL: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
// template<class A> function(allocator_arg_t, const A&, nullptr_t);
|
||||
//
|
||||
// This signature was removed in C++17
|
||||
|
||||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
#include "min_allocator.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
std::function<int(int)> f(std::allocator_arg, std::allocator<int>(), nullptr);
|
||||
}
|
||||
@@ -8,10 +8,13 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// REQUIRES-ANY: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
// template<class A> function(allocator_arg_t, const A&, nullptr_t);
|
||||
//
|
||||
// This signature was removed in C++17
|
||||
|
||||
#include <functional>
|
||||
#include <cassert>
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
// 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.
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// <functional>
|
||||
// XFAIL: c++98, c++03, c++11, c++14
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
// template<class A> function(allocator_arg_t, const A&, function&&);
|
||||
//
|
||||
// This signature was removed in C++17
|
||||
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
#include <cassert>
|
||||
|
||||
#include "test_macros.h"
|
||||
|
||||
class A
|
||||
{
|
||||
int data_[10];
|
||||
public:
|
||||
static int count;
|
||||
|
||||
A()
|
||||
{
|
||||
++count;
|
||||
for (int i = 0; i < 10; ++i)
|
||||
data_[i] = i;
|
||||
}
|
||||
|
||||
A(const A&) {++count;}
|
||||
|
||||
~A() {--count;}
|
||||
|
||||
int operator()(int i) const
|
||||
{
|
||||
for (int j = 0; j < 10; ++j)
|
||||
i += data_[j];
|
||||
return i;
|
||||
}
|
||||
};
|
||||
|
||||
int A::count = 0;
|
||||
|
||||
int g(int) { return 0; }
|
||||
|
||||
int main()
|
||||
{
|
||||
{
|
||||
std::function<int(int)> f = A();
|
||||
std::function<int(int)> f2(std::allocator_arg, std::allocator<A>(), std::move(f));
|
||||
}
|
||||
}
|
||||
@@ -8,12 +8,15 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
// UNSUPPORTED: c++98, c++03
|
||||
// REQUIRES-ANY: c++11, c++14
|
||||
|
||||
// <functional>
|
||||
|
||||
// class function<R(ArgTypes...)>
|
||||
|
||||
// template<class A> function(allocator_arg_t, const A&, function&&);
|
||||
//
|
||||
// This signature was removed in C++17
|
||||
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
Reference in New Issue
Block a user