summaryrefslogtreecommitdiffstats
path: root/libcxx/include/functional
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2012-02-21 21:46:43 +0000
committerHoward Hinnant <hhinnant@apple.com>2012-02-21 21:46:43 +0000
commitf2f2d8b98d7a7ae89f4c646be6dea7730b6409e0 (patch)
tree1dc829eb7a2207b8f516cdbab3ab57ec5f3ba4df /libcxx/include/functional
parentbd61856d91004d3534d7589da7d7062ebd74d3f5 (diff)
downloadbcm5719-llvm-f2f2d8b98d7a7ae89f4c646be6dea7730b6409e0.tar.gz
bcm5719-llvm-f2f2d8b98d7a7ae89f4c646be6dea7730b6409e0.zip
Modernize conversion to bool to the explicit bool conversion operator (library wide). This fixes http://llvm.org/bugs/show_bug.cgi?id=12058.
llvm-svn: 151088
Diffstat (limited to 'libcxx/include/functional')
-rw-r--r--libcxx/include/functional2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/functional b/libcxx/include/functional
index 8f912fb0f19..f941df261fe 100644
--- a/libcxx/include/functional
+++ b/libcxx/include/functional
@@ -1163,7 +1163,7 @@ public:
// function capacity:
_LIBCPP_INLINE_VISIBILITY
- /*explicit*/ operator bool() const _NOEXCEPT {return __f_;}
+ _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT {return __f_;}
// deleted overloads close possible hole in the type system
template<class _R2, class... _ArgTypes2>
OpenPOWER on IntegriCloud