1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark QtPrivate::ApplyReturnType constructor as explicit.

Browse Source 
Else, the operator,(T, ApplyReturnType<void>) is sometimes chosen if a
pointer is passed, and that is breaking some decltype expressions.
(such as the one in ComputeFunctorArgumentCount in the next patch)

Change-Id: Ic203bbb1a8f5abbebb3b11786454807aa20be5fd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Olivier Goffart 2013-03-03 17:22:26 +01:00 committed by The Qt Project
parent 67faba073d
commit e66159cfc7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qobjectdefs_impl.h
View File

@ -93,7 +93,7 @@ namespace QtPrivate {
template <typename T> template <typename T>
struct ApplyReturnValue { struct ApplyReturnValue {
void *data; void *data;
ApplyReturnValue(void *data_) : data(data_) {} explicit ApplyReturnValue(void *data_) : data(data_) {}
}; };
template<typename T, typename U> template<typename T, typename U>
void operator,(const T &value, const ApplyReturnValue<U> &container) { void operator,(const T &value, const ApplyReturnValue<U> &container) {