summaryrefslogtreecommitdiffstats
path: root/base/synchronization
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-04-17 00:35:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-17 07:36:06 +0000
commitfbce126c210689091efcfe670ca5ca6e63b0aab1 (patch)
tree77d3cbd1d68794fb6da594a698edf7edf1d215f7 /base/synchronization
parent9dac4a2384c5f250eb846989e4de2a5eac34f495 (diff)
downloadchromium_src-fbce126c210689091efcfe670ca5ca6e63b0aab1.zip
chromium_src-fbce126c210689091efcfe670ca5ca6e63b0aab1.tar.gz
chromium_src-fbce126c210689091efcfe670ca5ca6e63b0aab1.tar.bz2
Apply automated fixits for Chrome clang plugin to base_unittests.
Working on trimming down ~26k warnings on the Windows clang build. BUG=467287 Review URL: https://codereview.chromium.org/1092863002 Cr-Commit-Position: refs/heads/master@{#325606}
Diffstat (limited to 'base/synchronization')
-rw-r--r--base/synchronization/condition_variable_win.cc20
-rw-r--r--base/synchronization/waitable_event_watcher.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/base/synchronization/condition_variable_win.cc b/base/synchronization/condition_variable_win.cc
index 6dc4831..5f165c8 100644
--- a/base/synchronization/condition_variable_win.cc
+++ b/base/synchronization/condition_variable_win.cc
@@ -72,12 +72,12 @@ class ConditionVarImpl {
class WinVistaCondVar: public ConditionVarImpl {
public:
WinVistaCondVar(Lock* user_lock);
- ~WinVistaCondVar() {};
+ ~WinVistaCondVar() override {}
// Overridden from ConditionVarImpl.
- virtual void Wait() override;
- virtual void TimedWait(const TimeDelta& max_time) override;
- virtual void Broadcast() override;
- virtual void Signal() override;
+ void Wait() override;
+ void TimedWait(const TimeDelta& max_time) override;
+ void Broadcast() override;
+ void Signal() override;
private:
base::Lock& user_lock_;
@@ -127,12 +127,12 @@ void WinVistaCondVar::Signal() {
class WinXPCondVar : public ConditionVarImpl {
public:
WinXPCondVar(Lock* user_lock);
- ~WinXPCondVar();
+ ~WinXPCondVar() override;
// Overridden from ConditionVarImpl.
- virtual void Wait() override;
- virtual void TimedWait(const TimeDelta& max_time) override;
- virtual void Broadcast() override;
- virtual void Signal() override;
+ void Wait() override;
+ void TimedWait(const TimeDelta& max_time) override;
+ void Broadcast() override;
+ void Signal() override;
// Define Event class that is used to form circularly linked lists.
// The list container is an element with NULL as its handle_ value.
diff --git a/base/synchronization/waitable_event_watcher.h b/base/synchronization/waitable_event_watcher.h
index d4d8e77..eb51eff 100644
--- a/base/synchronization/waitable_event_watcher.h
+++ b/base/synchronization/waitable_event_watcher.h
@@ -92,7 +92,7 @@ class BASE_EXPORT WaitableEventWatcher
private:
#if defined(OS_WIN)
- virtual void OnObjectSignaled(HANDLE h) override;
+ void OnObjectSignaled(HANDLE h) override;
win::ObjectWatcher watcher_;
#else
// Implementation of MessageLoop::DestructionObserver