Author: aidandodds Date: Tue Jun 2 06:20:44 2015 New Revision: 238819 URL: http://llvm.org/viewvc/llvm-project?rev=238819&view=rev Log: Change use of keyword 'or' to '||' as keyword not supported by visual studio 2013.
Modified: lldb/trunk/source/Host/common/XML.cpp Modified: lldb/trunk/source/Host/common/XML.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/XML.cpp?rev=238819&r1=238818&r2=238819&view=diff ============================================================================== --- lldb/trunk/source/Host/common/XML.cpp (original) +++ lldb/trunk/source/Host/common/XML.cpp Tue Jun 2 06:20:44 2015 @@ -589,13 +589,13 @@ ApplePropertyList::ExtractStringFromValu 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); _______________________________________________ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits