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

Fix clashes between translator function in PythonModule.h/.cc #18786

Merged
merged 1 commit into from May 18, 2017

Conversation

Teemperor
Copy link
Contributor

We have two global TU-local 'translator' functions in CMSSW:
One is in PythonModule.cc and one is in PythonModule.h.

While having TU-local functions in a header is already not recommended,
having them defined twice with the same name like this is causing
undefined behavior that breaks the linker (and also the rest
of clang in the future once someone includes the wrong file).

This patch is making the name of the header function unique to prevent
future compiler errors.

We have two global TU-local 'translator' functions in CMSSW:
One is in PythonModule.cc and one is in PythonModule.h.

While having TU-local functions in a header is already not recommended,
having them defined twice with the same name like this is causing
undefined behavior that breaks the linker (and also the rest
of clang in the future once someone includes the wrong file).

This patch is making the name of the header function unique to prevent
future compiler errors.
@Teemperor
Copy link
Contributor Author

Part of the work to solve the issue #15248

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Teemperor (Raphael Isemann) for master.

It involves the following packages:

FWCore/PythonParameterSet

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

cms-bot commands are listed here

@Dr15Jones
Copy link
Contributor

Please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 17, 2017

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/19921/console Started: 2017/05/17 13:44

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@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 master IBs (tests are also fine). This pull request requires discussion in the ORP meeting before it's merged. @davidlange6, @smuzaffar

@cmsbuild
Copy link
Contributor

Comparison is ready
https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-18786/19921/summary.html

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 3364 differences found in the comparisons
  • DQMHistoTests: Total files compared: 24
  • DQMHistoTests: Total histograms compared: 1833867
  • DQMHistoTests: Total failures: 49133
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 1784554
  • DQMHistoTests: Total skipped: 180
  • DQMHistoTests: Total Missing objects: 0
  • Checked 98 log files, 14 edm output root files, 24 DQM output files

@davidlange6
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 6505f8b into cms-sw:master May 18, 2017
@Teemperor Teemperor deleted the FixClashingTranslatorFunction branch December 19, 2017 08:47
@Teemperor Teemperor restored the FixClashingTranslatorFunction branch December 19, 2017 10:42
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