diff options
| author | David Blaikie <dblaikie@gmail.com> | 2014-06-19 01:09:49 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2014-06-19 01:09:49 +0000 |
| commit | dd8406a6b7f0cbf9082c4bdb2cc8c3b3d5da6eec (patch) | |
| tree | 9ca064aa8b179e2f003122cc8e03d32eb6eec1a7 /include/llvm | |
| parent | 1260b844fd71720566eabd4cc5738f2abe747871 (diff) | |
| download | llvm-dd8406a6b7f0cbf9082c4bdb2cc8c3b3d5da6eec.tar.gz llvm-dd8406a6b7f0cbf9082c4bdb2cc8c3b3d5da6eec.tar.bz2 llvm-dd8406a6b7f0cbf9082c4bdb2cc8c3b3d5da6eec.tar.xz | |
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
Diffstat (limited to 'include/llvm')
| -rw-r--r-- | include/llvm/Support/StringPool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/llvm/Support/StringPool.h b/include/llvm/Support/StringPool.h index 7306ce2240..3e0465340c 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 <cassert> #include <new> @@ -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; } |