diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2013-03-03 17:22:26 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-19 23:16:03 +0100 |
| commit | e66159cfc7f78b8ad617175bbef6b70edbf9da6b (patch) | |
| tree | 8243bfbee74658fd1333adbf8e6fa776716a6e5a /src/corelib/kernel/qobjectdefs_impl.h | |
| parent | 67faba073dd0ded7de96430cdc7f7e1da7966880 (diff) | |
Mark QtPrivate::ApplyReturnType constructor as explicit.
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>
Diffstat (limited to 'src/corelib/kernel/qobjectdefs_impl.h')
| -rw-r--r-- | src/corelib/kernel/qobjectdefs_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h index 959a255389..46a6eab253 100644 --- a/src/corelib/kernel/qobjectdefs_impl.h +++ b/src/corelib/kernel/qobjectdefs_impl.h @@ -93,7 +93,7 @@ namespace QtPrivate { template <typename T> struct ApplyReturnValue { void *data; - ApplyReturnValue(void *data_) : data(data_) {} + explicit ApplyReturnValue(void *data_) : data(data_) {} }; template<typename T, typename U> void operator,(const T &value, const ApplyReturnValue<U> &container) { |