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

CondCore - remove newly committed odr violation; fix warning from boost #33961

Merged
merged 2 commits into from Jun 9, 2021
Merged

CondCore - remove newly committed odr violation; fix warning from boost #33961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2251b4b
remove newly committed odr violation; fix warning from boost
davidlange6 Jun 3, 2021
b265c83
code checks
davidlange6 Jun 3, 2021
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
6 changes: 3 additions & 3 deletions CondCore/CondDB/interface/CredentialStore.h
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@
#include <memory>
#include <string>
#include <sstream>
#include <algorithm>
//
#include "CoralBase/MessageStream.h"

Expand All @@ -19,10 +20,9 @@ namespace coral {

} // namespace coral

std::string to_lower(const std::string& s) {
inline std::string to_lower(const std::string& s) {
std::string str(s);
for (auto& c : str)
c = tolower(c);
std::transform(str.begin(), str.end(), str.begin(), [](unsigned char c) { return std::tolower(c); });
return str;
}

Expand Down
8 changes: 5 additions & 3 deletions CondCore/CondDB/plugins/RelationalAuthenticationService.cc
View file
Open in desktop
Expand Up @@ -16,15 +16,17 @@
#include <memory>
#include <sys/stat.h>

#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
Copy link
Contributor

Choose a reason for hiding this comment

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

The std:: has a bind and a std::function as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

@Dr15Jones Do you have further comment on this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Dr15Jones is correct. We did a campaign a year ago but it didn't cover this one. I'm just fixing a warning in this PR, but would support a migration by @l2_db


#include "CoralBase/MessageStream.h"

cond::RelationalAuthenticationService::RelationalAuthenticationService::RelationalAuthenticationService(
const std::string& key)
: coral::Service(key), m_authenticationPath(""), m_db(), m_cache(), m_callbackID(0) {
boost::function1<void, std::string> cb(boost::bind(
&cond::RelationalAuthenticationService::RelationalAuthenticationService::setAuthenticationPath, this, _1));
boost::function1<void, std::string> cb(
boost::bind(&cond::RelationalAuthenticationService::RelationalAuthenticationService::setAuthenticationPath,
this,
boost::placeholders::_1));

coral::Property* pm = dynamic_cast<coral::Property*>(
coral::Context::instance().PropertyManager().property(auth::COND_AUTH_PATH_PROPERTY));
Expand Down