diff options
| author | Sean Callanan <scallanan@apple.com> | 2013-10-03 22:27:29 +0000 |
|---|---|---|
| committer | Sean Callanan <scallanan@apple.com> | 2013-10-03 22:27:29 +0000 |
| commit | ddd7a2a65b24346f3d736d16315019fb54601e5b (patch) | |
| tree | 0b7e1240d0e85517fd394df3a68663b6e92bf0a4 /lldb/source/Core/ConstString.cpp | |
| parent | 54e14615e797d8cbd62fc27ba24a54de76bb380a (diff) | |
| download | bcm5719-llvm-ddd7a2a65b24346f3d736d16315019fb54601e5b.tar.gz bcm5719-llvm-ddd7a2a65b24346f3d736d16315019fb54601e5b.zip | |
Changed the bool conversion operator on ConstString
to be explicit, to prevent horrid things like
std::string a = ConstString("foo")
from taking the path ConstString -> bool -> char
-> std::string.
This fixes, among other things, ClangFunction.
<rdar://problem/15137989>
llvm-svn: 191934
Diffstat (limited to 'lldb/source/Core/ConstString.cpp')
| -rw-r--r-- | lldb/source/Core/ConstString.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/source/Core/ConstString.cpp b/lldb/source/Core/ConstString.cpp index 5bbcc5fe774..ce6e51108db 100644 --- a/lldb/source/Core/ConstString.cpp +++ b/lldb/source/Core/ConstString.cpp @@ -319,7 +319,7 @@ bool ConstString::GetMangledCounterpart (ConstString &counterpart) const { counterpart.m_string = StringPool().GetMangledCounterpart(m_string); - return counterpart; + return (bool)counterpart; } void |
