diff --git a/packages/muelu/src/Interface/MueLu_ML2MueLuParameterTranslator.hpp b/packages/muelu/src/Interface/MueLu_ML2MueLuParameterTranslator.hpp index c606d5e3fb79..34697f6fd4e9 100644 --- a/packages/muelu/src/Interface/MueLu_ML2MueLuParameterTranslator.hpp +++ b/packages/muelu/src/Interface/MueLu_ML2MueLuParameterTranslator.hpp @@ -128,13 +128,13 @@ namespace MueLu { // trim from start static inline std::string <rim(std::string &s) { - s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun(std::isspace)))); + s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int c){return !std::isspace(c);})); return s; } // trim from end static inline std::string &rtrim(std::string &s) { - s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun(std::isspace))).base(), s.end()); + s.erase(std::find_if(s.rbegin(), s.rend(), [](int c){return !std::isspace(c);}).base(), s.end()); return s; } diff --git a/packages/seacas/applications/ejoin/EJ_SystemInterface.h b/packages/seacas/applications/ejoin/EJ_SystemInterface.h index 8c138e6b7c41..3ecca20b1eaa 100644 --- a/packages/seacas/applications/ejoin/EJ_SystemInterface.h +++ b/packages/seacas/applications/ejoin/EJ_SystemInterface.h @@ -98,7 +98,7 @@ class SystemInterface bool zlib_{true}; bool szip_{false}; - std::string blockPrefix_{std::string("p")}; + std::string blockPrefix_{"p"}; vector3d offset_; double tolerance_{0.0}; diff --git a/packages/tpetra/core/src/Tpetra_Import_def.hpp b/packages/tpetra/core/src/Tpetra_Import_def.hpp index 29f3caab3ee3..1aa3a8798832 100644 --- a/packages/tpetra/core/src/Tpetra_Import_def.hpp +++ b/packages/tpetra/core/src/Tpetra_Import_def.hpp @@ -1177,7 +1177,7 @@ namespace Tpetra { const size_type numInvalidRemote = std::count_if (remoteProcIDs.begin (), remoteProcIDs.end (), - std::bind1st (std::equal_to (), -1)); + std::bind (std::equal_to (), -1, std::placeholders::_1)); TEUCHOS_TEST_FOR_EXCEPTION_CLASS_FUNC (numInvalidRemote == 0, std::logic_error, "Calling getRemoteIndexList " "on the source Map returned IDNotPresent, but none of the returned "