Remove some code churn.

llvm-svn: 211068

diff --git a/llvm/include/llvm/Support/Threading.h b/llvm/include/llvm/Support/Threading.h
index e33b52f90716af94f3cf1656db7bdb49430e4a35..bfcf1be37d34e226e9e3f04b6152b46faef1d6a2 100644 (file)
--- a/llvm/include/llvm/Support/Threading.h
+++ b/llvm/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/llvm/lib/Support/ManagedStatic.cpp b/llvm/lib/Support/ManagedStatic.cpp
index 76f86e398de6621129a6f126e89b14deb5aef441..1117190888baa58e8d82055fb756abbe6560bbe5 100644 (file)
--- a/llvm/lib/Support/ManagedStatic.cpp
+++ b/llvm/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();