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

Add missing #include in CondFormats/Common #47240

Merged
merged 1 commit into from
Feb 3, 2025

Conversation

fwyzard
Copy link
Contributor

@fwyzard fwyzard commented Feb 2, 2025

PR description:

Add missing #include statement.

Fixes the error

src/CondFormats/Common/src/SmallWORMDict.cc: In constructor 'cond::SmallWORMDict::SmallWORMDict(const std::vector<std::__cxx11::basic_string<char> >&)':
src/CondFormats/Common/src/SmallWORMDict.cc:20:10: error: 'sort' is not a member of 'std'; did you mean 'qsort'?
   20 |     std::sort(m_index.begin(), m_index.end(), [&idict](unsigned int a, unsigned int b) {
      |          ^~~~

observed in the GCC 14 builds.

PR validation:

The code compiles.

@fwyzard
Copy link
Contributor Author

fwyzard commented Feb 2, 2025

please test

@fwyzard
Copy link
Contributor Author

fwyzard commented Feb 2, 2025

type bugfix

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2025

cms-bot internal usage

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2025

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2025

A new Pull Request was created by @fwyzard for master.

It involves the following packages:

  • CondFormats/Common (db, alca)

@atpathak, @consuegs, @francescobrivio, @perrotta can you please review it and eventually sign? Thanks.
@JanChyczynski, @PonIlya, @mmusich, @rsreds, @seemasharmafnal, @tocheng, @yuanchao this is something you requested to watch as well.
@antoniovilela, @mandrenguyen, @rappoccio, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 2, 2025

+1

Size: This PR adds an extra 20KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e5a997/44137/summary.html
COMMIT: cd5ee35
CMSSW: CMSSW_15_0_X_2025-02-02-0000/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/47240/44137/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • No significant changes to the logs found
  • Reco comparison results: 9 differences found in the comparisons
  • DQMHistoTests: Total files compared: 50
  • DQMHistoTests: Total histograms compared: 4016938
  • DQMHistoTests: Total failures: 68
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 4016850
  • DQMHistoTests: Total skipped: 20
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 49 files compared)
  • Checked 218 log files, 189 edm output root files, 50 DQM output files
  • TriggerResults: no differences found

#include <string>
#include <functional>
#include <numeric>
#include <vector>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is already included in the header, not needed to be repeated here:

Suggested change
#include <vector>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can make the change, though I'm not fond of that approach, because if one removes the #include from the header then they have to update also the .cc file.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can make the change, though I'm not fond of that approach, because if one removes the #include from the header then they have to update also the .cc file.

Thank you @fwyzard
Well, in this case both vector and string are only used as arguments of the class methods (or related to it): if the corresponding #includes's are removed from the header, it means that those methods will become completely different, and the .cc file would necessarily need to be modified in any case.

@@ -1,7 +1,10 @@
#include "CondFormats/Common/interface/SmallWORMDict.h"
#include <algorithm>
#include <string>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also this one, by the way

Suggested change
#include <string>

@fwyzard
Copy link
Contributor Author

fwyzard commented Feb 3, 2025

please test

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2025

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2025

Pull request #47240 was updated. @atpathak, @consuegs, @francescobrivio, @perrotta can you please check and sign again.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2025

+1

Size: This PR adds an extra 24KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e5a997/44143/summary.html
COMMIT: 535a3bb
CMSSW: CMSSW_15_0_X_2025-02-02-2300/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/47240/44143/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially removed 2 lines from the logs
  • Reco comparison results: 5 differences found in the comparisons
  • DQMHistoTests: Total files compared: 50
  • DQMHistoTests: Total histograms compared: 4016938
  • DQMHistoTests: Total failures: 94
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 4016824
  • DQMHistoTests: Total skipped: 20
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 49 files compared)
  • Checked 218 log files, 189 edm output root files, 50 DQM output files
  • TriggerResults: no differences found

@fwyzard fwyzard force-pushed the add_missing_include branch from 535a3bb to a48a34f Compare February 3, 2025 13:46
@fwyzard
Copy link
Contributor Author

fwyzard commented Feb 3, 2025

Should be ready to sign.

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2025

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2025

Pull request #47240 was updated. @atpathak, @cmsbuild, @consuegs, @francescobrivio, @perrotta can you please check and sign again.

@perrotta
Copy link
Contributor

perrotta commented Feb 3, 2025

please test

@perrotta
Copy link
Contributor

perrotta commented Feb 3, 2025

+1

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2025

This pull request is fully signed and it will be integrated in one of the next master IBs after it passes the integration tests. This pull request will now be reviewed by the release team before it's merged. @sextonkennedy, @antoniovilela, @rappoccio, @mandrenguyen (and backports should be raised in the release meeting by the corresponding L2)

@cmsbuild
Copy link
Contributor

cmsbuild commented Feb 3, 2025

+1

Size: This PR adds an extra 24KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-e5a997/44159/summary.html
COMMIT: a48a34f
CMSSW: CMSSW_15_0_X_2025-02-03-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week1/cms-sw/cmssw/47240/44159/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

  • You potentially added 2 lines to the logs
  • Reco comparison results: 14 differences found in the comparisons
  • DQMHistoTests: Total files compared: 50
  • DQMHistoTests: Total histograms compared: 4016938
  • DQMHistoTests: Total failures: 69
  • DQMHistoTests: Total nulls: 0
  • DQMHistoTests: Total successes: 4016849
  • DQMHistoTests: Total skipped: 20
  • DQMHistoTests: Total Missing objects: 0
  • DQMHistoSizes: Histogram memory added: 0.0 KiB( 49 files compared)
  • Checked 218 log files, 189 edm output root files, 50 DQM output files
  • TriggerResults: no differences found

@mandrenguyen
Copy link
Contributor

+1

@cmsbuild cmsbuild merged commit 79f5b6e into cms-sw:master Feb 3, 2025
11 checks passed
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