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

Renamed likely macro to avoid name collision #23320

Merged
merged 3 commits into from May 28, 2018

Conversation

Dr15Jones
Copy link
Contributor

The likely and unlikely macros were renamed to LIKELY and
UNLIKELY to avoid name collisions with a function in boost.
Using all capital letters is the C family standard for naming
macros so best to follow convention.

The likely and unlikely macros were renamed to LIKELY and
UNLIKELY to avoid name collisions with a function in boost.
Using all capital letters is the C family standard for naming
macros so best to follow convention.
@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

-code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-23320/4811

Code check has found code style and quality issues which could be resolved by applying a patch in https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-23320/4811/git-diff.patch
e.g. curl https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-23320/4811/git-diff.patch | patch -p1

You can run scram build code-checks to apply code checks directly

Changes required by automated code-checks
@cmsbuild
Copy link
Contributor

The code-checks are being triggered in jenkins.

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

A new Pull Request was created by @Dr15Jones (Chris Jones) for master.

It involves the following packages:

CondFormats/SiPixelObjects
DataFormats/Phase2ITPixelCluster
DataFormats/TrackReco
EventFilter/CTPPSRawToDigi
EventFilter/SiPixelRawToDigi
EventFilter/SiStripRawToDigi
EventFilter/Utilities
FWCore/Concurrency
FWCore/Framework
FWCore/Utilities
Geometry/TrackerGeometryBuilder
RecoLocalTracker/SiPixelRecHits
RecoLocalTracker/SiStripClusterizer
RecoLocalTracker/SiStripRecHitConverter
RecoMuon/TrackingTools
RecoParticleFlow/PFClusterProducer
RecoPixelVertexing/PixelTrackFitting
RecoPixelVertexing/PixelTriplets
RecoTracker/CkfPattern
RecoTracker/ConversionSeedGenerators
RecoTracker/FinalTrackSelectors
RecoTracker/MeasurementDet
RecoTracker/TkDetLayers
RecoTracker/TkMSParametrization
RecoTracker/TkNavigation
RecoTracker/TkSeedGenerator
RecoTracker/TkSeedingLayers
RecoTracker/TkTrackingRegions
RecoTracker/TrackProducer
RecoVertex/VertexTools
TrackPropagation/RungeKutta
TrackingTools/DetLayers
TrackingTools/GeomPropagators
TrackingTools/GsfTools
TrackingTools/MaterialEffects
TrackingTools/MeasurementDet
TrackingTools/PatternTools
TrackingTools/TrackFitters
TrackingTools/TrajectoryParametrization
TrackingTools/TrajectoryState
TrackingTools/TransientTrack
Utilities/XrdAdaptor

@perrotta, @smuzaffar, @civanch, @Dr15Jones, @arunhep, @emeschi, @ianna, @mdhildreth, @cmsbuild, @mommsen, @franzoni, @kpedro88, @cerminar, @slava77, @ggovi, @lpernie can you please review it and eventually sign? Thanks.
@echabert, @felicepantaleo, @forthommel, @yduhm, @nickmccoll, @threus, @mmusich, @seemasharmafnal, @venturia, @mmarionncern, @battibass, @makortel, @jhgoh, @lgray, @HuguesBrun, @drkovalskyi, @OlivierBondu, @trocino, @rociovilar, @abbiendi, @GiacomoSguazzoni, @rovere, @VinInn, @bellan, @tocheng, @mschrode, @ebrondol, @dgulhan, @echapon, @gbenelli, @wddgit, @calderona, @dkotlins, @bachtis, @Martin-Grunewald, @cbernet, @gpetruc, @folguera this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

@Dr15Jones
Copy link
Contributor Author

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented May 24, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/28171/console Started: 2018/05/24 19:28

@perrotta
Copy link
Contributor

please test
(just to clean up comparisons)

@cmsbuild
Copy link
Contributor

cmsbuild commented May 25, 2018

The tests are being triggered in jenkins.
https://cmssdt.cern.ch/jenkins/job/ib-any-integration/28183/console Started: 2018/05/25 11:16

@cmsbuild
Copy link
Contributor

@cmsbuild
Copy link
Contributor

Comparison job queued.

@cmsbuild
Copy link
Contributor

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

Comparison Summary:

  • No significant changes to the logs found
  • Reco comparison results: 0 differences found in the comparisons
  • DQMHistoTests: Total files compared: 31
  • DQMHistoTests: Total histograms compared: 2901706
  • DQMHistoTests: Total failures: 1
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 2901515
  • DQMHistoTests: Total skipped: 190
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 30 files compared)
  • Checked 128 log files, 14 edm output root files, 31 DQM output files

@perrotta
Copy link
Contributor

+1

  • Technical
  • Jenkins tests pass

@mommsen
Copy link
Contributor

mommsen commented May 26, 2018

+1

@smuzaffar
Copy link
Contributor

@fabiocos , can we merge this? It is just a technical update.

@fabiocos
Copy link
Contributor

@ggovi @lpernie @arunhep the changes look purely technical and do not affect the output. I merge this code, please comment in case you see issues

@fabiocos
Copy link
Contributor

+1

@fabiocos
Copy link
Contributor

merge

@cmsbuild cmsbuild merged commit 0536110 into cms-sw:master May 28, 2018
@Dr15Jones Dr15Jones deleted the renameLikely branch May 29, 2018 13:51
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

7 participants