From 33619de07232bf40c00d9ff149bf62e0da2faa1c Mon Sep 17 00:00:00 2001
From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Wed, 9 Jan 2013 16:56:40 +0100
Subject: [PATCH] Revert "Change location of %op% operator in multicompare"
 It's no longer needed with the proper fix for Token::Match().

This reverts commit 8b2adf1391f5ae02040ecf1fdc6c2d422e87c343.
---
 lib/templatesimplifier.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
index ff8dc47a1..b1d7b4f03 100644
--- a/lib/templatesimplifier.cpp
+++ b/lib/templatesimplifier.cpp
@@ -793,7 +793,7 @@ bool TemplateSimplifier::simplifyCalculations(Token *_tokens)
         // keep parentheses here: operator new [] (size_t);
         // keep parentheses here: Functor()(a ... )
         // keep parentheses here: ) ( var ) ;
-        if (Token::Match(tok->next(), "( %var% ) %op%|;|)|,|]") &&
+        if (Token::Match(tok->next(), "( %var% ) ;|)|,|]|%op%") &&
             !tok->isName() &&
             tok->str() != ">" &&
             tok->str() != "]" &&