From 403cb6c9b17343999f09df79b82b56e77bd93839 Mon Sep 17 00:00:00 2001 From: tzik Date: Wed, 9 Mar 2016 23:17:25 -0800 Subject: Replace template_util.h stuff with C++11 BUG=554293 Review URL: https://codereview.chromium.org/1774443002 Cr-Commit-Position: refs/heads/master@{#380369} --- extensions/common/permissions/base_set_operators.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'extensions/common') diff --git a/extensions/common/permissions/base_set_operators.h b/extensions/common/permissions/base_set_operators.h index 2ac5357..ffe0323 100644 --- a/extensions/common/permissions/base_set_operators.h +++ b/extensions/common/permissions/base_set_operators.h @@ -11,7 +11,6 @@ #include #include "base/memory/linked_ptr.h" -#include "base/template_util.h" namespace extensions { @@ -71,8 +70,8 @@ class BaseSetOperators { BaseSetOperators() { // Ensure |T| is convertible to us, so we can safely downcast when calling // methods that must exist in |T|. - static_assert((base::is_convertible*>::value), - "U ptr must implicitly convert to T ptr"); + static_assert(std::is_convertible*>::value, + "U ptr must implicitly convert to T ptr"); } BaseSetOperators(const T& set) { -- cgit v1.1