From c43ddc6964ad214699ce047bb414389666d909fc Mon Sep 17 00:00:00 2001
From: Peter Vingelmann <petya@master.com>
Date: Thu, 15 Sep 2016 19:33:20 +0200
Subject: [PATCH] Revert template disambiguator fix

---
 src/ASBeautifier.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/ASBeautifier.cpp b/src/ASBeautifier.cpp
index 3adcb3a..9eaf53f 100644
--- a/src/ASBeautifier.cpp
+++ b/src/ASBeautifier.cpp
@@ -2871,18 +2871,6 @@ void ASBeautifier::parseCurrentLine(const string& line)
 			         && ASBeautifier::peekNextChar(line, i + (*newHeader).length() - 1) != '(')
 				newHeader = NULL;
 
-            // The "template" disambiguator for dependent names should not be
-            // recognized as an actual template header. For example:
-            //   T::template foo<X>()
-            //   s.template foo<X>();
-            //   this->template foo<X>();
-            if (newHeader == &AS_TEMPLATE
-                    && (prevNonSpaceCh == ':' || prevNonSpaceCh == '.'
-                        || prevNonSpaceCh == '-'))
-            {
-                newHeader = NULL;
-            }
-
 			if (newHeader != NULL)
 			{
 				// if we reached here, then this is a header...