From 76679255a302a94d0a5e581d67e74eff7aa6e682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sun, 10 Apr 2011 11:50:19 +0200
Subject: [PATCH] Preprocessor: Use %oror% in multiCompare pattern

---
 lib/preprocessor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index 185224423..c392241c6 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -1505,7 +1505,7 @@ void Preprocessor::simplifyCondition(const std::map<std::string, std::string> &v
 
     for (Token *tok = const_cast<Token *>(tokenizer.tokens()); tok; tok = tok->next())
     {
-        while ((tok->str() == "(" || tok->str() == "||") && (Token::simpleMatch(tok->tokAt(2), "|| 1")))
+        while (Token::Match(tok, "(|%oror% %any% %oror% 1"))
         {
             tok->deleteNext();
             tok->deleteNext();