https://git.reactos.org/?p=reactos.git;a=commitdiff;h=95269bc8d17d7223bf2a7b...
commit 95269bc8d17d7223bf2a7be0b1c6927c466d1476 Author: Timo Kreuzer timo.kreuzer@reactos.org AuthorDate: Sun Apr 28 20:56:40 2019 +0200 Commit: Hervé Poussineau hpoussin@reactos.org CommitDate: Mon May 27 13:22:40 2019 +0200
[GLU32] Fix indentation
Fixes GCC 8 warnings: dll/opengl/glu32/src/libnurbs/internals/subdivider.cc:852:2: error: this 'if' clause does not guard... [-Werror=misleading-indentation] if( jarc->pwlArc ) jarc->pwlArc->deleteMe( pwlarcpool ); jarc->pwlArc = 0; ^~ dll/opengl/glu32/src/libnurbs/internals/subdivider.cc:852:59: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if' if( jarc->pwlArc ) jarc->pwlArc->deleteMe( pwlarcpool ); jarc->pwlArc = 0; ^~~~ --- dll/opengl/glu32/src/libnurbs/internals/quilt.cc | 3 ++- dll/opengl/glu32/src/libnurbs/internals/subdivider.cc | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dll/opengl/glu32/src/libnurbs/internals/quilt.cc b/dll/opengl/glu32/src/libnurbs/internals/quilt.cc index d51188a2de..b99f92f49d 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/quilt.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/quilt.cc @@ -62,7 +62,8 @@ Quilt::deleteMe( Pool& p ) { for( Quiltspec *q=qspec; q != eqspec; q++ ) { #if 1 - if( q->breakpoints) delete[] q->breakpoints; q->breakpoints = 0; + if( q->breakpoints) delete[] q->breakpoints; + q->breakpoints = 0; #else if( q->breakpoints) { delete[] q->breakpoints; diff --git a/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc b/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc index d003d1ebc4..e12d063b12 100644 --- a/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc +++ b/dll/opengl/glu32/src/libnurbs/internals/subdivider.cc @@ -849,8 +849,10 @@ Subdivider::freejarcs( Bin& bin )
Arc_ptr jarc; while( (jarc = bin.removearc()) != NULL ) { - if( jarc->pwlArc ) jarc->pwlArc->deleteMe( pwlarcpool ); jarc->pwlArc = 0; - if( jarc->bezierArc) jarc->bezierArc->deleteMe( bezierarcpool ); jarc->bezierArc = 0; + if( jarc->pwlArc ) jarc->pwlArc->deleteMe( pwlarcpool ); + jarc->pwlArc = 0; + if( jarc->bezierArc) jarc->bezierArc->deleteMe( bezierarcpool ); + jarc->bezierArc = 0; jarc->deleteMe( arcpool ); } }
-
Timo Kreuzer