From dd8406a6b7f0cbf9082c4bdb2cc8c3b3d5da6eec Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Thu, 19 Jun 2014 01:09:49 +0000 Subject: [PATCH] Fix breakage from r211244 by using LLVM_EXPLICIT to avoid using explicit operators under MSVC where they're not supported. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@211246 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/StringPool.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/llvm/Support/StringPool.h b/include/llvm/Support/StringPool.h index 7306ce2240b..3e0465340c3 100644 --- a/include/llvm/Support/StringPool.h +++ b/include/llvm/Support/StringPool.h @@ -29,6 +29,7 @@ #ifndef LLVM_SUPPORT_STRINGPOOL_H #define LLVM_SUPPORT_STRINGPOOL_H +#include "llvm/Support/Compiler.h" #include "llvm/ADT/StringMap.h" #include #include @@ -128,7 +129,7 @@ namespace llvm { } inline const char *operator*() const { return begin(); } - inline explicit operator bool() const { return S != nullptr; } + inline LLVM_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; }