diff options
author | Howard Hinnant <hhinnant@apple.com> | 2011-07-01 19:24:36 +0000 |
---|---|---|
committer | Howard Hinnant <hhinnant@apple.com> | 2011-07-01 19:24:36 +0000 |
commit | 5a33687da07cb8ffc68ef5065ed46bab5c4d6555 (patch) | |
tree | a040ca6f46310d29afc2a8f8b3337eb6c692a8eb /libcxx/test/utilities/function.objects | |
parent | 68b0e8456e7934b97ffb22b07fdde705abd33fd1 (diff) | |
download | bcm5719-llvm-5a33687da07cb8ffc68ef5065ed46bab5c4d6555.tar.gz bcm5719-llvm-5a33687da07cb8ffc68ef5065ed46bab5c4d6555.zip |
Correct for new rules regarding implicitly deleted special members. http://llvm.org/bugs/show_bug.cgi?id=10191
llvm-svn: 134248
Diffstat (limited to 'libcxx/test/utilities/function.objects')
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp index bfce90105c2..0efb4d9ac25 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy.pass.cpp @@ -107,7 +107,7 @@ int main() assert(new_called == 1); assert(f.target<A>()); assert(f.target<int(*)(int)>() == 0); - std::function<int(int)> f2 = _STD::move(f); + std::function<int(int)> f2 = std::move(f); assert(A::count == 1); assert(new_called == 1); assert(f2.target<A>()); diff --git a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp index 714dbe9565e..544ec439ba9 100644 --- a/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp +++ b/libcxx/test/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp @@ -111,7 +111,7 @@ int main() assert(f.target<A>()); assert(f.target<int(*)(int)>() == 0); std::function<int(int)> f2; - f2 = _STD::move(f); + f2 = std::move(f); assert(A::count == 1); assert(new_called == 1); assert(f2.target<A>()); |