diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-24 16:24:13 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-25 14:13:32 +0100 |
| commit | 3f50c38dc070f4bb515c1b64450dae14f316474e (patch) | |
| tree | 29f309f9534e05c47244eedb438fc612578d133b /base/spin_wait.h | |
| parent | e23bef148f7be2bdf9c3cb2cd3aa5ceebf1190fb (diff) | |
| download | external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.zip external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.gz external_chromium-3f50c38dc070f4bb515c1b64450dae14f316474e.tar.bz2 | |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
Diffstat (limited to 'base/spin_wait.h')
| -rw-r--r-- | base/spin_wait.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/spin_wait.h b/base/spin_wait.h index 34484d2..1e31b14 100644 --- a/base/spin_wait.h +++ b/base/spin_wait.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,11 +12,11 @@ // We provide a simple one argument spin wait (for 1 second), and a generic // spin wait (for longer periods of time). -#ifndef BASE_SPIN_WAIT_H__ -#define BASE_SPIN_WAIT_H__ +#ifndef BASE_SPIN_WAIT_H_ +#define BASE_SPIN_WAIT_H_ #pragma once -#include "base/platform_thread.h" +#include "base/threading/platform_thread.h" #include "base/time.h" // Provide a macro that will wait no longer than 1 second for an asynchronous @@ -44,8 +44,8 @@ kTimeout.InMilliseconds()) << "Timed out"; \ break; \ } \ - PlatformThread::Sleep(50); \ + base::PlatformThread::Sleep(50); \ } \ } while (0) -#endif // BASE_SPIN_WAIT_H__ +#endif // BASE_SPIN_WAIT_H_ |