From 497b7bb3e32d3d8cbc92dbe4dde6d56615f7a15f Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Mon, 16 Jun 2014 22:40:29 +0000 Subject: [PATCH] Remove some code churn. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211068 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Threading.h | 5 ++--- lib/Support/ManagedStatic.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/llvm/Support/Threading.h b/include/llvm/Support/Threading.h index e33b52f9071..bfcf1be37d3 100644 --- a/include/llvm/Support/Threading.h +++ b/include/llvm/Support/Threading.h @@ -18,11 +18,10 @@ #include "llvm/Support/Mutex.h" namespace llvm { - - /// llvm_get_global_lock() - returns the llvm global lock object. + /// llvm_get_global_lock - returns the llvm global lock object. sys::Mutex &llvm_get_global_lock(); - /// llvm_is_multithreaded() - returns true if LLVM is compiled with support + /// llvm_is_multithreaded - returns true if LLVM is compiled with support /// for multiple threads, and false otherwise. bool llvm_is_multithreaded(); diff --git a/lib/Support/ManagedStatic.cpp b/lib/Support/ManagedStatic.cpp index 76f86e398de..1117190888b 100644 --- a/lib/Support/ManagedStatic.cpp +++ b/lib/Support/ManagedStatic.cpp @@ -24,7 +24,7 @@ void ManagedStaticBase::RegisterManagedStatic(void *(*Creator)(), void (*Deleter)(void*)) const { assert(Creator); if (llvm_is_multithreaded()) { - llvm::MutexGuard Lock(llvm_get_global_lock()); + llvm::MutexGuard Lock(llvm::llvm_get_global_lock()); if (!Ptr) { void* tmp = Creator();