[ARM] Support for ARMv6-Z / ARMv6-ZK missing

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

diff --git a/include/llvm/Support/StringPool.h b/include/llvm/Support/StringPool.h
index 3e0465340c3b472a32cf38124ea695d1681f6ba5..2ec0c3b76c11f13557ee5f810baa46a3bf7d512d 100644 (file)
--- a/include/llvm/Support/StringPool.h
+++ b/include/llvm/Support/StringPool.h
@@ -29,10 +29,8 @@
 #ifndef LLVM_SUPPORT_STRINGPOOL_H
 #define LLVM_SUPPORT_STRINGPOOL_H
 
-#include "llvm/Support/Compiler.h"
 #include "llvm/ADT/StringMap.h"
 #include <cassert>
-#include <new>
 
 namespace llvm {
 
@@ -129,7 +127,7 @@ namespace llvm {
     }
 
     inline const char *operator*() const { return begin(); }
-    inline LLVM_EXPLICIT operator bool() const { return S != nullptr; }
+    inline explicit operator bool() const { return S != nullptr; }
 
     inline bool operator==(const PooledStringPtr &That) const { return S == That.S; }
     inline bool operator!=(const PooledStringPtr &That) const { return S != That.S; }