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

[CC8] unit test fixed, no need to use static ServiceToken and Registry #28425

Merged
merged 1 commit into from
Nov 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions CondCore/CondDB/test/testConnectionPool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ int main(int argc, char** argv) {
edm::ParameterSet pSet;
pSet.addParameter("@service_type", std::string("SiteLocalConfigService"));
psets.push_back(pSet);
static const edm::ServiceToken services(edm::ServiceRegistry::createSet(psets));
static const edm::ServiceRegistry::Operate operate(services);
const edm::ServiceToken services(edm::ServiceRegistry::createSet(psets));
const edm::ServiceRegistry::Operate operate(services);

std::array<std::string, 2> connectionStrings{
{"frontier://FrontierPrep/CMS_CONDITIONS",
Expand Down
4 changes: 2 additions & 2 deletions CondCore/CondDB/test/testFrontier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ int main(int argc, char** argv) {
edm::ParameterSet pSet;
pSet.addParameter("@service_type", std::string("SiteLocalConfigService"));
psets.push_back(pSet);
static const edm::ServiceToken services(edm::ServiceRegistry::createSet(psets));
static const edm::ServiceRegistry::Operate operate(services);
const edm::ServiceToken services(edm::ServiceRegistry::createSet(psets));
const edm::ServiceRegistry::Operate operate(services);

std::string connectionString("frontier://FrontierProd/CMS_CONDITIONS");
std::cout << "# Connecting with db in " << connectionString << std::endl;
Expand Down