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.

Sign up for GitHub

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

Jump to bottom

fix clang build error: replace static const with static constexpr #20468

Merged
merged 1 commit into from Sep 12, 2017
Merged

fix clang build error: replace static const with static constexpr #20468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DataFormats/L1TGlobal/interface/GlobalAlgBlk.h
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ class GlobalAlgBlk


public:
const static unsigned int maxPhysicsTriggers = 512;
static constexpr unsigned int maxPhysicsTriggers = 512;

/// set simple members
void setL1MenuUUID(int uuid) { m_orbitNr = uuid; }
Expand Down
2 changes: 1 addition & 1 deletion Validation/HGCalValidation/plugins/HGCalHitCalibration.cc
View file
Open in desktop
Expand Up @@ -76,7 +76,7 @@ class HGCalHitCalibration : public DQMEDAnalyzer {
std::map<int, MonitorElement*> hgcal_photon_EoP_CPene_calib_fraction_;
MonitorElement* LayerOccupancy_;

static const int layers_ = 60;
static constexpr int layers_ = 60;
std::array<float, layers_> Energy_layer_calib_;
std::array<float, layers_> Energy_layer_calib_fraction_;
};
Expand Down
2 changes: 1 addition & 1 deletion Validation/HGCalValidation/plugins/HGCalShowerSeparation.cc
View file
Open in desktop
Expand Up @@ -84,7 +84,7 @@ class HGCalShowerSeparation : public DQMEDAnalyzer {
std::vector<MonitorElement*> idealDeltaXY_;
std::vector<MonitorElement*> centers_;

static const int layers_ = 52;
static constexpr int layers_ = 52;
};

HGCalShowerSeparation::HGCalShowerSeparation(const edm::ParameterSet& iConfig)
Expand Down