| Index: base/memory/weak_ptr.h
|
| diff --git a/base/memory/weak_ptr.h b/base/memory/weak_ptr.h
|
| index c335ae9852bdcf69b55563c217bb16acebc24fdb..c62f29c7478ab9ef2d0a807fa1f3bf0e921c7cf6 100644
|
| --- a/base/memory/weak_ptr.h
|
| +++ b/base/memory/weak_ptr.h
|
| @@ -161,8 +161,8 @@ class SupportsWeakPtrBase {
|
| static WeakPtr<Derived> StaticAsWeakPtr(Derived* t) {
|
| typedef
|
| is_convertible<Derived, internal::SupportsWeakPtrBase&> convertible;
|
| - COMPILE_ASSERT(convertible::value,
|
| - AsWeakPtr_argument_inherits_from_SupportsWeakPtr);
|
| + static_assert(convertible::value,
|
| + "AsWeakPtr argument must inherit from SupportsWeakPtr");
|
| return AsWeakPtrImpl<Derived>(t, *t);
|
| }
|
|
|
|
|