diff options
| author | Ben Murdoch <benm@google.com> | 2012-03-05 14:35:55 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2012-04-11 15:40:15 +0100 |
| commit | c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9 (patch) | |
| tree | 6f84ef396408af3c9f08eaac783ecf1a957b0fee /src/runtime-profiler.h | |
| parent | 592a9fc1d8ea420377a2e7efd0600e20b058be2b (diff) | |
| download | android_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.tar.gz android_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.tar.bz2 android_external_v8-c7cc028aaeedbbfa11c11d0b7b243b3d9e837ed9.zip | |
Merge V8 at 3.8.9.11
Bug: 5688872
Change-Id: Ie3b1dd67a730ec5e82686b7b37dba26f6a9bb24f
Diffstat (limited to 'src/runtime-profiler.h')
| -rw-r--r-- | src/runtime-profiler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime-profiler.h b/src/runtime-profiler.h index 15c20971..d35b5df8 100644 --- a/src/runtime-profiler.h +++ b/src/runtime-profiler.h @@ -46,7 +46,7 @@ class RuntimeProfiler { static void GlobalSetup(); static inline bool IsEnabled() { - ASSERT(has_been_globally_setup_); + ASSERT(has_been_globally_set_up_); return enabled_; } @@ -54,7 +54,7 @@ class RuntimeProfiler { void NotifyTick(); - void Setup(); + void SetUp(); void Reset(); void TearDown(); @@ -126,7 +126,7 @@ class RuntimeProfiler { static Semaphore* semaphore_; #ifdef DEBUG - static bool has_been_globally_setup_; + static bool has_been_globally_set_up_; #endif static bool enabled_; }; |