| Index: extensions/common/permissions/base_set_operators.h
|
| diff --git a/extensions/common/permissions/base_set_operators.h b/extensions/common/permissions/base_set_operators.h
|
| index 38ff091870b2f4936fe5d1d99ba71ce7d4d3cf64..d18321ca0afb7852b03519b8f0187a4a3d29cb66 100644
|
| --- a/extensions/common/permissions/base_set_operators.h
|
| +++ b/extensions/common/permissions/base_set_operators.h
|
| @@ -69,8 +69,8 @@ class BaseSetOperators {
|
| BaseSetOperators() {
|
| // Ensure |T| is convertible to us, so we can safely downcast when calling
|
| // methods that must exist in |T|.
|
| - COMPILE_ASSERT((base::is_convertible<T*, BaseSetOperators<T>*>::value),
|
| - U_ptr_must_implicitly_convert_to_T_ptr);
|
| + static_assert((base::is_convertible<T*, BaseSetOperators<T>*>::value),
|
| + "U ptr must implicitly convert to T ptr");
|
| }
|
|
|
| BaseSetOperators(const T& set) {
|
|
|