Skip to content
Snippets Groups Projects
Commit 360fcc9b authored by Andrea Coccaro's avatar Andrea Coccaro
Browse files

Merge branch 'cherry-pick-f8e708ae-22.0' into '22.0'

Sweeping !57132 from master to 22.0.
TrigConfStorage: Fix thread-safety checker warnings.

See merge request !57200
parents c9b12a98 e3cba222
No related branches found
No related tags found
4 merge requests!69091Fix correlated smearing bug in JER in JetUncertainties in 22.0,!58791DataQualityConfigurations: Modify L1Calo config for web display,!572112022-10-03: daily merge of 22.0 into master,!57200Sweeping !57132 from master to 22.0. TrigConfStorage: Fix thread-safety checker warnings.
...@@ -243,7 +243,7 @@ LogicExpression::totalNumberOfElements() const { ...@@ -243,7 +243,7 @@ LogicExpression::totalNumberOfElements() const {
void void
LogicExpression::printError(const std::string& message, int i) const { LogicExpression::printError(const std::string& message, int i) {
std::string m="Error while parsing : "; std::string m="Error while parsing : ";
std::string s=""; std::string s="";
int n = m.size(); int n = m.size();
...@@ -256,7 +256,7 @@ LogicExpression::printError(const std::string& message, int i) const { ...@@ -256,7 +256,7 @@ LogicExpression::printError(const std::string& message, int i) const {
void void
LogicExpression::printCurrentState() const { LogicExpression::printCurrentState() {
char aaa[100]; char aaa[100];
sprintf(aaa, "Current state: State=%c Nsublogics=%d Element=%s", sprintf(aaa, "Current state: State=%c Nsublogics=%d Element=%s",
m_State, (int)subLogics().size(), m_Element.c_str()); m_State, (int)subLogics().size(), m_Element.c_str());
...@@ -265,7 +265,7 @@ LogicExpression::printCurrentState() const { ...@@ -265,7 +265,7 @@ LogicExpression::printCurrentState() const {
void void
LogicExpression::print(const std::string& indent) const { LogicExpression::print(const std::string& indent) {
std::string s=indent; std::string s=indent;
if (m_State == kELEMENT) { if (m_State == kELEMENT) {
m_ostream << indent << m_Element << std::endl; m_ostream << indent << m_Element << std::endl;
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
*/ */
#ifndef TrigConf_LogicExpression #ifndef TrigConf_LogicExpression
...@@ -70,9 +70,9 @@ namespace TrigConf { ...@@ -70,9 +70,9 @@ namespace TrigConf {
void markPlaceHolder(); void markPlaceHolder();
void normalize(); void normalize();
void printError(const std::string& message, int i) const; void printError(const std::string& message, int i);
void printCurrentState() const; void printCurrentState();
void print(const std::string& indent="") const; void print(const std::string& indent="");
void clear(); void clear();
protected: protected:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment