Revert 253497 and 253539 to try to fix clang-cmake-mips buildbot.

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

diff --git a/include/llvm/Support/StringPool.h b/include/llvm/Support/StringPool.h
index 7e1394cb2335692e3d25243f46efefd78f3b22e8..2ec0c3b76c11f13557ee5f810baa46a3bf7d512d 100644 (file)
--- a/include/llvm/Support/StringPool.h
+++ b/include/llvm/Support/StringPool.h
@@ -31,7 +31,6 @@
 
 #include "llvm/ADT/StringMap.h"
 #include <cassert>
-#include <new>
 
 namespace llvm {
 
@@ -128,10 +127,10 @@ namespace llvm {
     }
 
     inline const char *operator*() const { return begin(); }
-    inline operator bool() const { return S != nullptr; }
+    inline explicit operator bool() const { return S != nullptr; }
 
-    inline bool operator==(const PooledStringPtr &That) { return S == That.S; }
-    inline bool operator!=(const PooledStringPtr &That) { return S != That.S; }
+    inline bool operator==(const PooledStringPtr &That) const { return S == That.S; }
+    inline bool operator!=(const PooledStringPtr &That) const { return S != That.S; }
   };
 
 } // End llvm namespace