LWG2442: call_once() shouldn't DECAY_COPY(). Patch from K-Ballo.

This patch fixes LWG issue 2422 by removing the DECAY_COPY from call once.
The review can be found here: http://reviews.llvm.org/D10191


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@239654 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2015-06-13 02:23:00 +00:00
parent eeeada1c77
commit bc1e44d14e
3 changed files with 79 additions and 23 deletions

View File

@@ -14,7 +14,7 @@
// struct once_flag;
// template<class Callable, class ...Args>
// void call_once(once_flag& flag, Callable func, Args&&... args);
// void call_once(once_flag& flag, Callable&& func, Args&&... args);
#include <mutex>
#include <thread>
@@ -153,6 +153,35 @@ public:
}
};
class NonCopyable
{
#if !defined(__clang__)
// GCC 4.8 complains about the following being private
public:
NonCopyable(const NonCopyable&)
{
}
#else
NonCopyable(const NonCopyable&);
#endif
public:
NonCopyable() {}
void operator()(int&) {}
};
#if __cplusplus >= 201103L
// reference qualifiers on functions are a C++11 extension
struct RefQual
{
int lv_called, rv_called;
RefQual() : lv_called(0), rv_called(0) {}
void operator()() & { ++lv_called; }
void operator()() && { ++rv_called; }
};
#endif
#endif
int main()
@@ -204,5 +233,22 @@ int main()
std::once_flag f;
std::call_once(f, MoveOnly(), MoveOnly());
}
// check LWG2442: call_once() shouldn't DECAY_COPY()
{
std::once_flag f;
int i = 0;
std::call_once(f, NonCopyable(), i);
}
#if __cplusplus >= 201103L
// reference qualifiers on functions are a C++11 extension
{
std::once_flag f1, f2;
RefQual rq;
std::call_once(f1, rq);
assert(rq.lv_called == 1);
std::call_once(f2, std::move(rq));
assert(rq.rv_called == 1);
}
#endif
#endif // _LIBCPP_HAS_NO_VARIADICS
}