diff options
author | Aidan Dodds <aidan@codeplay.com> | 2015-06-02 11:20:44 +0000 |
---|---|---|
committer | Aidan Dodds <aidan@codeplay.com> | 2015-06-02 11:20:44 +0000 |
commit | 7f7b61dc53b49c22266cdb14503893421eb9da91 (patch) | |
tree | 5e7620843b6f1cc29137c0785f100dc3b440f88f | |
parent | 5f6f60d942bc81e034313dc1925bf07d7aa7095d (diff) | |
download | bcm5719-llvm-7f7b61dc53b49c22266cdb14503893421eb9da91.tar.gz bcm5719-llvm-7f7b61dc53b49c22266cdb14503893421eb9da91.zip |
Change use of keyword 'or' to '||' as keyword not supported by visual studio 2013.
llvm-svn: 238819
-rw-r--r-- | lldb/source/Host/common/XML.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Host/common/XML.cpp b/lldb/source/Host/common/XML.cpp index d00f103b095..14e786ab8b1 100644 --- a/lldb/source/Host/common/XML.cpp +++ b/lldb/source/Host/common/XML.cpp @@ -589,13 +589,13 @@ ApplePropertyList::ExtractStringFromValueNode (const XMLNode &node, std::string if (node.IsValid()) { llvm::StringRef element_name = node.GetName(); - if (element_name == "true" or element_name == "false") + if (element_name == "true" || element_name == "false") { // The text value _is_ the element name itself... value = std::move(element_name.str()); return true; } - else if (element_name == "dict" or element_name == "array") + else if (element_name == "dict" || element_name == "array") return false; // dictionaries and arrays have no text value, so we fail else return node.GetElementText(value); |