summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/utilities/function.objects
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2015-02-10 15:17:46 +0000
committerEric Fiselier <eric@efcs.ca>2015-02-10 15:17:46 +0000
commit85b788c9c2e64774969489b987bf36b69a7f79bf (patch)
treeee0a1db95b72b4588a9f08754139e70a324e244e /libcxx/test/std/utilities/function.objects
parent1a178c5663fad62689b63818cb1426cb6b2b9f5f (diff)
downloadbcm5719-llvm-85b788c9c2e64774969489b987bf36b69a7f79bf.tar.gz
bcm5719-llvm-85b788c9c2e64774969489b987bf36b69a7f79bf.zip
Fix use of C++11 extensions in C++03 code.
llvm-svn: 228698
Diffstat (limited to 'libcxx/test/std/utilities/function.objects')
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
index 599092258da..17601db7c42 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.pass.cpp
@@ -82,9 +82,11 @@ int main()
assert(f);
assert(f.target<int (A::*)(int) const>() != 0);
}
+#if __cplusplus >= 201103L
{
Foo f;
std::function<void(int)> fun = std::bind(&Foo::bar, &f, std::placeholders::_1);
fun(10);
}
+#endif
}
diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
index 15bf3398f5f..bb8feff7a16 100644
--- a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.pass.cpp
@@ -79,7 +79,7 @@ int main()
assert(globalMemCounter.checkOutstandingNewEq(0));
{
assert(globalMemCounter.checkOutstandingNewEq(0));
- non_default_test_allocator<std::function<int(int)>> al(1);
+ non_default_test_allocator<std::function<int(int)> > al(1);
std::function<int(int)> f2(std::allocator_arg, al, g);
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(f2.target<int(*)(int)>());
OpenPOWER on IntegriCloud