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 /chrome/chrome_watcher | |
| 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 'chrome/chrome_watcher')
| -rw-r--r-- | chrome/chrome_watcher/chrome_watcher_main.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/chrome_watcher/chrome_watcher_main.cc b/chrome/chrome_watcher/chrome_watcher_main.cc index 18f4b5a..1976c7a 100644 --- a/chrome/chrome_watcher/chrome_watcher_main.cc +++ b/chrome/chrome_watcher/chrome_watcher_main.cc @@ -27,7 +27,6 @@ #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" -#include "base/template_util.h" #include "base/thread_task_runner_handle.h" #include "base/threading/thread.h" #include "base/time/time.h" @@ -443,5 +442,5 @@ extern "C" int WatcherMain(const base::char16* registry_path, } static_assert( - base::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value, + std::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value, "WatcherMain() has wrong type"); |