diff options
| author | tzik <tzik@chromium.org> | 2016-03-09 23:17:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-10 07:19:09 +0000 |
| commit | 403cb6c9b17343999f09df79b82b56e77bd93839 (patch) | |
| tree | 4c072eb309fc7e1245e908ce2a8130541e555a42 /extensions/common | |
| parent | 2df71fea360d6abde88d9c0de8fe084cb95f670e (diff) | |
| download | chromium_src-403cb6c9b17343999f09df79b82b56e77bd93839.zip chromium_src-403cb6c9b17343999f09df79b82b56e77bd93839.tar.gz chromium_src-403cb6c9b17343999f09df79b82b56e77bd93839.tar.bz2 | |
Replace template_util.h stuff with C++11 <type_traits>
BUG=554293
Review URL: https://codereview.chromium.org/1774443002
Cr-Commit-Position: refs/heads/master@{#380369}
Diffstat (limited to 'extensions/common')
| -rw-r--r-- | extensions/common/permissions/base_set_operators.h | 5 |
1 files changed, 2 insertions, 3 deletions
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 <map> #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<T*, BaseSetOperators<T>*>::value), - "U ptr must implicitly convert to T ptr"); + static_assert(std::is_convertible<T*, BaseSetOperators<T>*>::value, + "U ptr must implicitly convert to T ptr"); } BaseSetOperators(const T& set) { |