Merge pull request #33961 from davidlange6/dl210603cc

CondCore - remove newly committed odr violation; fix warning from boost
cms-sw · Jun 9, 2021 · c9e1641 · c9e1641
2 parents e1cfe70 + b265c83
commit c9e1641
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/CondCore/CondDB/interface/CredentialStore.h b/CondCore/CondDB/interface/CredentialStore.h
@@ -7,6 +7,7 @@
 #include <memory>
 #include <string>
 #include <sstream>
+#include <algorithm>
 //
 #include "CoralBase/MessageStream.h"
 
@@ -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;
 }
 

diff --git a/CondCore/CondDB/plugins/RelationalAuthenticationService.cc b/CondCore/CondDB/plugins/RelationalAuthenticationService.cc
@@ -16,15 +16,17 @@
 #include <memory>
 #include <sys/stat.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #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));