diff options
| author | David Blaikie <dblaikie@gmail.com> | 2013-02-21 06:05:57 +0000 |
|---|---|---|
| committer | David Blaikie <dblaikie@gmail.com> | 2013-02-21 06:05:57 +0000 |
| commit | 2bbc19c1c6cd60b9c56750d7b03311c47a88b748 (patch) | |
| tree | 5de494a806c5f04c35fc27e77040a30927e22b14 /include | |
| parent | 214df4285a974c61450477cbcf5c4a196d574a6a (diff) | |
| download | external_llvm-2bbc19c1c6cd60b9c56750d7b03311c47a88b748.zip external_llvm-2bbc19c1c6cd60b9c56750d7b03311c47a88b748.tar.gz external_llvm-2bbc19c1c6cd60b9c56750d7b03311c47a88b748.tar.bz2 | |
Make Optional<T>'s operator bool 'explicit' in C++11
Provides a general way to add 'explicit' for conversion operators (a no-op when
compiling as C++98).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@175723 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/ADT/Optional.h | 2 | ||||
| -rw-r--r-- | include/llvm/Support/Compiler.h | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/llvm/ADT/Optional.h b/include/llvm/ADT/Optional.h index 844e309..c5dc299 100644 --- a/include/llvm/ADT/Optional.h +++ b/include/llvm/ADT/Optional.h @@ -86,7 +86,7 @@ public: const T& getValue() const LLVM_LVALUE_FUNCTION { assert(hasVal); return *getPointer(); } T& getValue() LLVM_LVALUE_FUNCTION { assert(hasVal); return *getPointer(); } - operator bool() const { return hasVal; } + LLVM_EXPLICIT operator bool() const { return hasVal; } bool hasValue() const { return hasVal; } const T* operator->() const { return getPointer(); } T* operator->() { return getPointer(); } diff --git a/include/llvm/Support/Compiler.h b/include/llvm/Support/Compiler.h index adc0ce2..25f42a9 100644 --- a/include/llvm/Support/Compiler.h +++ b/include/llvm/Support/Compiler.h @@ -341,4 +341,14 @@ # define LLVM_IS_UNALIGNED_ACCESS_FAST 0 #endif +/// \macro LLVM_EXPLICIT +/// \brief Expands to explicit on compilers which support explicit conversion +/// operators. Otherwise expands to nothing. +#if (__has_feature(cxx_explicit_conversions) \ + || defined(__GXX_EXPERIMENTAL_CXX0X__)) +#define LLVM_EXPLICIT explicit +#else +#define LLVM_EXPLICIT +#endif + #endif |