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 | d3d6de2703aef281180e2af74d012d2fa8cc8ff8 (patch) | |
| tree | 49df0d67951dde0824cc9f9308258dff7ae69690 /llvm/include | |
| parent | 92fc7419986ab025a53f63521161a3e1b1812654 (diff) | |
| download | bcm5719-llvm-d3d6de2703aef281180e2af74d012d2fa8cc8ff8.tar.gz bcm5719-llvm-d3d6de2703aef281180e2af74d012d2fa8cc8ff8.zip | |
Fix breakage from r211244 by using LLVM_EXPLICIT to avoid using explicit operators under MSVC where they're not supported.
llvm-svn: 211246
Diffstat (limited to 'llvm/include')
| -rw-r--r-- | llvm/include/llvm/Support/StringPool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/include/llvm/Support/StringPool.h b/llvm/include/llvm/Support/StringPool.h index 7306ce2240b..3e0465340c3 100644 --- a/llvm/include/llvm/Support/StringPool.h +++ b/llvm/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; } |
