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

Remove obsolete conditional compilations in Framework only #12420

Merged

Conversation

wmtan
Copy link
Contributor

@wmtan wmtan commented Nov 14, 2015

For some reason, double initial and final underscores appear in this comment as single underscores. They should be double.
This PR removes the use of obsolete conditional compilations from the framework, now that C++11 and ROOT6 are supported from now on.
In particular, _ CINT_, _ MAKECINT_, _ GCCXML_, _ REFLEX_, and CMS_NOCXX11 are no longer ever set, GCC11_OVERRIDE always evaluates to "override", and ROOT_VERSION_CODE is always larger that the ROOT releases to which it is being compared.
Note that _ ROOTCLING_ is still used, so uses of _ ROOTCLING_ are untouched by this PR.
This clean up is for Core Software only. Code outside core software is not touched.
This PR should not affect the compiled code at all.
Note also that all uses of std::atomic in the framework are transient, so they do not need to be protected from ROOT. This is unchanged by this PR.

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @wmtan for CMSSW_8_0_X.

It involves the following packages:

DataFormats/Common
DataFormats/FWLite
DataFormats/Provenance
FWCore/Common
FWCore/MessageLogger
FWCore/TFWLiteSelector
FWCore/Utilities
IOPool/Output
IOPool/Streamer

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

Following commands in first line of a comment are recognized

  • +1|approve[d]|sign[ed]: L1/L2's to approve it
  • -1|reject[ed]: L1/L2's to reject it
  • assign <category>[,<category>[,...]]: L1/L2's to request signatures from other categories
  • unassign <category>[,<category>[,...]]: L1/L2's to remove signatures from other categories
  • hold: L1/L2's to mark it as on hold
  • merge: L1/release managers to merge this request
  • [@cmsbuild,] please test: L1/L2 and selected users to start jenkins tests
  • [@cmsbuild,] please test with cms-sw/cmsdist#<PR>: L1/L2 and selected users to start jenkins tests using externals from cmsdist

@wmtan
Copy link
Contributor Author

wmtan commented Nov 14, 2015

@VinInn This is the cleanup of obsolete preprocessor directives, but only in Core Software, not in all of CMSSW.

@Dr15Jones
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

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

@cmsbuild
Copy link
Contributor

-1

Tested at: 987f142
I found errors in the following unit tests:

---> test runtestRecoLocalCaloHGCalRecProducers had ERRORS
---> test runtestSimCalorimetryHGCalSimProducers had ERRORS
---> test testDataFormatsPatCandidates had ERRORS

you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12420/9720/summary.html

@cmsbuild
Copy link
Contributor

@Dr15Jones
Copy link
Contributor

Test failures are not related to this pull request since they are already see in the IBs.

@Dr15Jones
Copy link
Contributor

please test

@cmsbuild
Copy link
Contributor

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

@Dr15Jones
Copy link
Contributor

+1

@cmsbuild
Copy link
Contributor

This pull request is fully signed and it will be integrated in one of the next CMSSW_8_0_X IBs after it passes the integration tests. This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @Degano, @smuzaffar

davidlange6 added a commit that referenced this pull request Nov 16, 2015
…tions

Remove obsolete conditional compilations in Framework only
@davidlange6 davidlange6 merged commit 598738f into cms-sw:CMSSW_8_0_X Nov 16, 2015
@wmtan wmtan deleted the RemoveObsoleteConditionalCompilations branch November 16, 2015 17:37
@cmsbuild
Copy link
Contributor

-1

Tested at: 987f142
I found errors in the following unit tests:

---> test runtestSimCalorimetryHGCalSimProducers had ERRORS
---> test testDataFormatsPatCandidates had ERRORS
---> test runtestRecoLocalCaloHGCalRecProducers had ERRORS

you can see the results of the tests here:
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-12420/9755/summary.html

@cmsbuild
Copy link
Contributor

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.

4 participants