cpp11migrate --addoverride

[gartung]

All override keywords added by the clang extras utility cpp11-migrate --add-override.

[gartung]

Splitting into one branch per package.

[gartung]

Everything on one branch.

[ktf]

This one does not compile because:

Fireworks/Core/src/FWEveDigitSetScalableMarker.cc

is included in:

Fireworks/Core/src/classes.h

and genreflex chokes on it. Can you please fix it?

@alja is there any way we can avoid including a cc file in classes.h?

[alja]

I will split the code into header and source file if this helps to solve the problem.

[gartung]

Backed out change to Fireworks/Core/src/FWEveDigitSetScalableMarker.cc

[Dr15Jones]

ROOT's c++ parser can't handle the C++11 keyword 'override'. So the only way I can see ti fix this is to do something like the following in the header definition

#define OVERRIDE_KEYWORD
#if !defined(__CINT__) && !defined(__MAKECINT__)
#undef OVERRIDE_KEYWORD
#define OVERRIDE_KEYWORD override
#endif

and then replace all occurences of override with OVERRIDE_KEYWORD in that header.

[wmtan]

I have been using GCCXML, rather than CINT and MAKECINT. That will work, and is more consistent with use elsewhere.

[alja]

Thanks for the workaround. Will split the code into header and source anyway. It was my laziness I did not do this at the first place.

[ktf]

@nclopezo can you test?

[nclopezo]

Hi,

I took this changes on top of CMSSW_7_0_X_2013-08-16-0200, The compilation fails because there is a extra override keyword in the file:

/build/dmendezl/CMSSW_7_0_X_2013-08-16-0200/src/SimGeneral/MixingModule/plugins/HiMixingModule.cc

in line 119

[ktf]

Complete error, please.

[nclopezo]

Hi Giulio,

this is the error message:

/build/dmendezl/CMSSW_7_0_X_2013-08-16-0200/src/SimGeneral/MixingModule/plugins/HiMixingModule.cc:119:9: error: 'override' does not name a type

if you look at the file you can see the extra "override" keyword. Maybe given the amount of files github is not letting me make a comment on the diff.

[ktf]

You are right, it does look like there is an extra override. @gartung can you
look into this?

[gartung]

On 8/16/2013 7:44 AM, Giulio Eulisse wrote:

You are right, it does look like there is an extra override.
@gartung can you
look into this?

—
Reply to this email directly or view it on GitHub
#332 (comment).

Sorry I missed that in my build log:

/storage/local/data1/gartung/CMSSW_7_0_0_pre1/src/SimGeneral/MixingModule/plugins/HiMixingModule.cc:119:9:
error: 'override' does not name a type

[ktf]

Thanks. @nclopezo can you give it another try when you have time? Thanks.

[cmsbuild]

The following categories have been signed by @fwyzard: HLT

@cms-git-hlt

[cmsbuild]

The following categories have been signed by andreasp (a.k.a. @apfeiffer1 on GitHub): Database

@cms-git-db

[cmsbuild]

The following categories have been signed by andreasp (a.k.a. @apfeiffer1 on GitHub): Database

@cms-git-db

[cmsbuild]

The following categories have been signed by andreasp (a.k.a. @apfeiffer1 on GitHub): Database

@cms-git-db

[cmsbuild]

The following categories have been signed by ciulli (a.k.a. @vciulli on GitHub): Generators

@cms-git-generators

[cmsbuild]

The following categories have been signed by @demattia: Calibration and Alignment

@cms-git-alca

[cmsbuild]

The following categories have been signed by speer (a.k.a. @thspeer on GitHub): Reconstruction

@cms-git-reconstruction

[nclopezo]

Hi,

I took this changes on top of CMSSW_7_0_X_2013-08-19-0200, I ran the unit tests and RelVals. All tests passed.

[cmsbuild]

The following categories have been signed by chrjones (a.k.a. @Dr15Jones on GitHub): Visualization, Geometry, Core

@cms-git-visualization, @cms-git-core, @cms-git-geometry

[cmsbuild]

The following categories have been signed by @vadler: Analysis

@cms-git-analysis

[gartung]

Rebased to current cmssw/CMSSW_7_0_X

[ktf]

I built and run the tests.

https://cmssdt.cern.ch/jenkins/job/Pull-Request-Integration/ARCHITECTURE=slc5_amd64_gcc472/204/console

since this is really technical changes, I'll bypass.