rename 'Result' to 'OS' in CalcTypeName for consistency

[oota-llvm.git] / lib / VMCore / LeakDetector.cpp

diff --git a/lib/VMCore/LeakDetector.cpp b/lib/VMCore/LeakDetector.cpp
index 41e08737f83c9d51a199a3fd9f4e59499596c924..1bf9171553837c7fc0e8d0aaa78d9908c2fa9f08 100644 (file)
--- a/lib/VMCore/LeakDetector.cpp
+++ b/lib/VMCore/LeakDetector.cpp
@@ -12,10 +12,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/LeakDetector.h"
+#include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Streams.h"
 #include "llvm/Value.h"
-#include <set>
 using namespace llvm;
 
 namespace {
@@ -31,7 +31,7 @@ namespace {
 
   template <typename T>
   struct VISIBILITY_HIDDEN LeakDetectorImpl {
-    LeakDetectorImpl(const char* const name) : Cache(0), Name(name) { }
+    explicit LeakDetectorImpl(const char* const name) : Cache(0), Name(name) { }
 
     // Because the most common usage pattern, by far, is to add a
     // garbage object, then remove it immediately, we optimize this
@@ -60,7 +60,7 @@ namespace {
 
       if (!Ts.empty()) {
         cerr << "Leaked " << Name << " objects found: " << Message << ":\n";
-        for (typename std::set<const T*>::iterator I = Ts.begin(),
+        for (typename SmallPtrSet<const T*, 8>::iterator I = Ts.begin(),
                E = Ts.end(); I != E; ++I) {
           cerr << "\t";
           PrinterTrait<T>::print(*I);
@@ -74,27 +74,27 @@ namespace {
     }
 
   private:
-    std::set<const T*> Ts;
+    SmallPtrSet<const T*, 8> Ts;
     const T* Cache;
     const char* const Name;
   };
 
-  LeakDetectorImpl<void>  *Objects;
-  LeakDetectorImpl<Value> *LLVMObjects;
+  static LeakDetectorImpl<void>  *Objects;
+  static LeakDetectorImpl<Value> *LLVMObjects;
 
-  LeakDetectorImpl<void> &getObjects() {
+  static LeakDetectorImpl<void> &getObjects() {
     if (Objects == 0)
       Objects = new LeakDetectorImpl<void>("GENERIC");
     return *Objects;
   }
 
-  LeakDetectorImpl<Value> &getLLVMObjects() {
+  static LeakDetectorImpl<Value> &getLLVMObjects() {
     if (LLVMObjects == 0)
       LLVMObjects = new LeakDetectorImpl<Value>("LLVM");
     return *LLVMObjects;
   }
 
-  void clearGarbage() {
+  static void clearGarbage() {
     delete Objects;
     delete LLVMObjects;
     Objects = 0;