From 7f7b61dc53b49c22266cdb14503893421eb9da91 Mon Sep 17 00:00:00 2001 From: Aidan Dodds Date: Tue, 2 Jun 2015 11:20:44 +0000 Subject: [PATCH] Change use of keyword 'or' to '||' as keyword not supported by visual studio 2013. llvm-svn: 238819 --- lldb/source/Host/common/XML.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/source/Host/common/XML.cpp b/lldb/source/Host/common/XML.cpp index d00f103b..14e786a 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); -- 2.7.4