r312639 - Replacing "or" with "||" to appease MSVC.

[Aaron Ballman via cfe-commits]

Author: aaronballman
Date: Wed Sep  6 08:12:05 2017
New Revision: 312639

URL: http://llvm.org/viewvc/llvm-project?rev=312639&view=rev
Log:
Replacing "or" with "||" to appease MSVC.

Modified:
    cfe/trunk/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp

Modified: cfe/trunk/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp?rev=312639&r1=312638&r2=312639&view=diff
==============================================================================
--- cfe/trunk/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp (original)
+++ cfe/trunk/unittests/Tooling/LexicallyOrderedRecursiveASTVisitorTest.cpp Wed Sep  6 08:12:05 2017
@@ -83,7 +83,7 @@ bool LexicallyOrderedDeclVisitor::VisitN
       OS << ND->getNameAsString();
     else
       OS << "???";
-    if (isa<DeclContext>(D) or isa<TemplateDecl>(D))
+    if (isa<DeclContext>(D) || isa<TemplateDecl>(D))
       OS << "/";
   }
   if (EmitDeclIndices)