generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a problem with reference_wrapper in C++03 that was causing counting predicates to fail. Add a test to make sure it works. However, most of the reference_wrapper tests still fail in C++03 mode, due to a lack of decltype. No change there.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@214760 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2014-08-04 19:20:17 +00:00
parent b4ed5ca01e
commit 529d303340
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/__functional_base_03
View File

@ -1027,7 +1027,7 @@ public:
typename __invoke_return0<type&, _A0>::type typename __invoke_return0<type&, _A0>::type
operator() (_A0& __a0) const operator() (_A0& __a0) const
{ {
return __invoke(get(), __a0); return __invoke<type&, _A0>(get(), __a0);
} }
template <class _A0, class _A1> template <class _A0, class _A1>
@ -1035,7 +1035,7 @@ public:
typename __invoke_return1<type&, _A0, _A1>::type typename __invoke_return1<type&, _A0, _A1>::type
operator() (_A0& __a0, _A1& __a1) const operator() (_A0& __a0, _A1& __a1) const
{ {
return __invoke(get(), __a0, __a1); return __invoke<type&, _A0, _A1>(get(), __a0, __a1);
} }
template <class _A0, class _A1, class _A2> template <class _A0, class _A1, class _A2>
@ -1043,7 +1043,7 @@ public:
typename __invoke_return2<type&, _A0, _A1, _A2>::type typename __invoke_return2<type&, _A0, _A1, _A2>::type
operator() (_A0& __a0, _A1& __a1, _A2& __a2) const operator() (_A0& __a0, _A1& __a1, _A2& __a2) const
{ {
return __invoke(get(), __a0, __a1, __a2); return __invoke<type&, _A0, _A1, _A2>(get(), __a0, __a1, __a2);
} }
}; };

18
test/utilities/function.objects/refwrap/refwrap.helpers/ref_2.pass.cpp
View File

@ -16,10 +16,28 @@
#include <functional> #include <functional>
#include <cassert> #include <cassert>
#include "counting_predicates.hpp"
bool is5 ( int i ) { return i == 5; }
template <typename T>
bool call_pred ( T pred ) { return pred(5); }
int main() int main()
{ {
{
int i = 0; int i = 0;
std::reference_wrapper<int> r1 = std::ref(i); std::reference_wrapper<int> r1 = std::ref(i);
std::reference_wrapper<int> r2 = std::ref(r1); std::reference_wrapper<int> r2 = std::ref(r1);
assert(&r2.get() == &i); assert(&r2.get() == &i);
}
{
unary_counting_predicate<bool(*)(int), int> cp(is5);
assert(!cp(6));
assert(cp.count() == 1);
assert(call_pred(cp));
assert(cp.count() == 1);
assert(call_pred(std::ref(cp)));
assert(cp.count() == 2);
}
} }