From 850a36b2f654c1de5da8703530b440aaf6a2ccae Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Thu, 16 Jun 2016 12:33:38 -0700 Subject: [PATCH] Update clang-format options for clang-format 3.9.0 --- Makefile | 2 +- geometry.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a955dac..5645f15 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ clean: rm -f tippecanoe *.o indent: - clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false}" $(C) $(H) + clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false, SortIncludes: false}" $(C) $(H) TESTS = $(wildcard tests/*/out/*.json) SPACE = $(NULL) $(NULL) diff --git a/geometry.cpp b/geometry.cpp index 88b3f7d..152f68c 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -314,8 +314,7 @@ static void decode_clipped(ClipperLib::PolyNode *t, drawvec &out) { } } } - nextring: - ; + nextring:; } // Then reverse the winding order of any rings that turned out