Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CommonTools/Utils : formatting fix for gcc 6.0 misleading-indentation warning #15026

Merged
merged 1 commit into from Jul 3, 2016
Merged

CommonTools/Utils : formatting fix for gcc 6.0 misleading-indentation warning #15026

merged 1 commit into from Jul 3, 2016

Conversation

gartung
Copy link
Member

@gartung gartung commented Jun 28, 2016

In file included from /build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/Utils/test/testComparators.cc:2:0:
/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/Utils/interface/PointerComparator.h: In member function 'bool PointerComparator::operator()(const first_argument_type_, const second_argument_type_) const':
/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/Utils/interface/PointerComparator.h:21:7: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
if ( t1 == 0 || t2 == 0 )
^~
/build/cmsbuild/jenkins-workarea/workspace/build-any-ib/w/tmp/BUILDROOT/8258e37281729e179b5af9c3b033d930/opt/cmssw/slc6_amd64_gcc600/cms/cmssw/CMSSW_8_1_X_2016-06-26-2300/src/CommonTools/Utils/interface/PointerComparator.h:24:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
return cmp( *t1, *t2 );
^~~~~~

@gartung gartung changed the title : gcc 6.0 misleading-indentation warning flags potential bug; with formatting fix CommonTools/Utils : gcc 6.0 misleading-indentation warning flags potential bug; with formatting fix Jun 28, 2016
@cmsbuild cmsbuild added this to the Next CMSSW_8_1_X milestone Jun 28, 2016
@cmsbuild
Copy link
Contributor

A new Pull Request was created by @gartung (Patrick Gartung) for CMSSW_8_1_X.

It involves the following packages:

CommonTools/Utils

@cmsbuild, @cvuosalo, @slava77, @davidlange6 can you please review it and eventually sign? Thanks.
@makortel this is something you requested to watch as well.
@slava77, @Degano, @smuzaffar you are the release manager for this.

cms-bot commands are list here #13028

@cvuosalo
Copy link
Contributor

@cmsbuild please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Jun 29, 2016

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/13787/console

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

@gartung gartung changed the title CommonTools/Utils : gcc 6.0 misleading-indentation warning flags potential bug; with formatting fix CommonTools/Utils : formatting fix for gcc 6.0 misleading-indentation warning Jul 1, 2016
@cvuosalo
Copy link
Contributor

cvuosalo commented Jul 1, 2016

+1

For #15026 01f0ca1

Cosmetic changes to PointerComparator.h to enhance readability. There should be no change in the output from the compiler.

The code changes are satisfactory, and Jenkins tests against baseline CMSSW_8_1_X_2016-06-28-2300 show no significant differences, as expected.

@davidlange6
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Jul 3, 2016

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_1_X IBs (tests are also fine). This pull request will be automatically merged.

@cmsbuild cmsbuild merged commit 1709345 into cms-sw:CMSSW_8_1_X Jul 3, 2016
@gartung gartung deleted the CommonTools-Utils-fix-indent-not-guard branch July 8, 2016 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants