| Index: base/bind_helpers.h
|
| diff --git a/base/bind_helpers.h b/base/bind_helpers.h
|
| index 660348e667c102b526b13a1d46a6c720cf30b293..a551465ce8148430a7a62747cd909db8f5ecd284 100644
|
| --- a/base/bind_helpers.h
|
| +++ b/base/bind_helpers.h
|
| @@ -563,15 +563,12 @@ static inline internal::OwnedWrapper<T> Owned(T* o) {
|
| // Both versions of Passed() prevent T from being an lvalue reference. The first
|
| // via use of enable_if, and the second takes a T* which will not bind to T&.
|
| template <typename T,
|
| - typename std::enable_if<internal::IsMoveOnlyType<T>::value &&
|
| - !std::is_lvalue_reference<T>::value>::type* =
|
| + typename std::enable_if<!std::is_lvalue_reference<T>::value>::type* =
|
| nullptr>
|
| static inline internal::PassedWrapper<T> Passed(T&& scoper) {
|
| return internal::PassedWrapper<T>(std::move(scoper));
|
| }
|
| -template <typename T,
|
| - typename std::enable_if<internal::IsMoveOnlyType<T>::value>::type* =
|
| - nullptr>
|
| +template <typename T>
|
| static inline internal::PassedWrapper<T> Passed(T* scoper) {
|
| return internal::PassedWrapper<T>(std::move(*scoper));
|
| }
|
|
|