Skip to content

Commit e1b3b3e

Browse files
committed
Use concurrency to initialise/deactivate xerces in XmlConfigParser
1 parent 563952f commit e1b3b3e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

L1Trigger/L1TCommon/BuildFile.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<use name="xerces-c"/>
2+
<use name="Utilities/Xerces"/>
23
<use name="CondFormats/L1TObjects"/>
34
<export>
45
<lib name="1"/>

L1Trigger/L1TCommon/src/XmlConfigParser.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ using namespace std;
88

99
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1010
#include "Utilities/Xerces/interface/XercesStrUtils.h"
11+
#include "Utilities/Xerces/interface/Xerces.h"
1112

1213
#include "xercesc/util/PlatformUtils.hpp"
1314

@@ -53,7 +54,7 @@ XmlConfigParser::XmlConfigParser()
5354
kAttrDelim(nullptr),
5455
kAttrModule(nullptr),
5556
kTypeTable("table") {
56-
XMLPlatformUtils::Initialize();
57+
cms::concurrency::xercesInitialize();
5758

5859
kTagHw = XMLString::transcode("system");
5960
kTagAlgo = XMLString::transcode("algo");
@@ -114,7 +115,7 @@ XmlConfigParser::XmlConfigParser(DOMDocument* doc)
114115
kAttrDelim(nullptr),
115116
kAttrModule(nullptr),
116117
kTypeTable("table") {
117-
XMLPlatformUtils::Initialize();
118+
cms::concurrency::xercesInitialize();
118119

119120
kTagHw = XMLString::transcode("system");
120121
kTagAlgo = XMLString::transcode("algo");
@@ -147,7 +148,7 @@ XmlConfigParser::XmlConfigParser(DOMDocument* doc)
147148

148149
XmlConfigParser::~XmlConfigParser() {
149150
delete parser_;
150-
XMLPlatformUtils::Terminate();
151+
cms::concurrency::xercesTerminate();
151152
}
152153

153154
void XmlConfigParser::readDOMFromString(const std::string& str, DOMDocument*& doc) {

0 commit comments

Comments
 (0)