[C+11] Add 'override' keyword to methods in the support library.

[oota-llvm.git] / include / llvm / Support / ManagedStatic.h

diff --git a/include/llvm/Support/ManagedStatic.h b/include/llvm/Support/ManagedStatic.h
index 4a12a1ba8e7962eff527c437ae0764246dc2750f..5587618d11bb60028b588fedab463445a088f19b 100644 (file)
--- a/include/llvm/Support/ManagedStatic.h
+++ b/include/llvm/Support/ManagedStatic.h
@@ -14,9 +14,9 @@
 #ifndef LLVM_SUPPORT_MANAGED_STATIC_H
 #define LLVM_SUPPORT_MANAGED_STATIC_H
 
+#include "llvm/Support/Atomic.h"
 #include "llvm/Support/Threading.h"
 #include "llvm/Support/Valgrind.h"
-#include <atomic>
 
 namespace llvm {
 
@@ -64,8 +64,7 @@ public:
   // Accessors.
   C &operator*() {
     void* tmp = Ptr;
-    if (llvm_is_multithreaded())
-      std::atomic_thread_fence(std::memory_order_seq_cst);
+    if (llvm_is_multithreaded()) sys::MemoryFence();
     if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call);
     TsanHappensAfter(this);
 
@@ -73,8 +72,7 @@ public:
   }
   C *operator->() {
     void* tmp = Ptr;
-    if (llvm_is_multithreaded())
-      std::atomic_thread_fence(std::memory_order_seq_cst);
+    if (llvm_is_multithreaded()) sys::MemoryFence();
     if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call);
     TsanHappensAfter(this);
 
@@ -82,8 +80,7 @@ public:
   }
   const C &operator*() const {
     void* tmp = Ptr;
-    if (llvm_is_multithreaded())
-      std::atomic_thread_fence(std::memory_order_seq_cst);
+    if (llvm_is_multithreaded()) sys::MemoryFence();
     if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call);
     TsanHappensAfter(this);
 
@@ -91,8 +88,7 @@ public:
   }
   const C *operator->() const {
     void* tmp = Ptr;
-    if (llvm_is_multithreaded())
-      std::atomic_thread_fence(std::memory_order_seq_cst);
+    if (llvm_is_multithreaded()) sys::MemoryFence();
     if (!tmp) RegisterManagedStatic(object_creator<C>, object_deleter<C>::call);
     TsanHappensAfter(this);