update astyle to 3.1

qgis · Jan 23, 2018 · 834a945 · 834a945
1 parent f2273c6
commit 834a945
Show file tree

Hide file tree

Showing 9 changed files with 1,758 additions and 699 deletions.
diff --git a/external/astyle/ASBeautifier.cpp b/external/astyle/ASBeautifier.cpp
diff --git a/external/astyle/ASEnhancer.cpp b/external/astyle/ASEnhancer.cpp
@@ -1,5 +1,5 @@
 // ASEnhancer.cpp
-// Copyright (c) 2017 by Jim Pattee <jimp03@email.com>.
+// Copyright (c) 2018 by Jim Pattee <jimp03@email.com>.
 // This code is licensed under the MIT License.
 // License.md describes the conditions under which this software may be distributed.
 
@@ -679,7 +679,6 @@ size_t ASEnhancer::processSwitchBlock(string& line, size_t index)
 	if (line[i] == '}')
 	{
 		sw.switchBraceCount--;
-		assert(sw.switchBraceCount <= braceCount);
 		if (sw.switchBraceCount == 0)                 // if end of switch statement
 		{
 			int lineUnindent = sw.unindentDepth;