https://bugs.gentoo.org/932251 https://github.com/mongodb/mongo/commit/f8e4be7f6da71f978b2aa9991febb4c7ad89c903#diff-010644a9158d28e5745762753c7ce454444c9fb9ab4c684e9f2fdcff50c6f539 https://bugs.gentoo.org/932251#c3 --- a/src/mongo/db/initialize_server_global_state.cpp +++ b/src/mongo/db/initialize_server_global_state.cpp @@ -34,7 +34,7 @@ #include "mongo/db/initialize_server_global_state.h" #include "mongo/db/initialize_server_global_state_gen.h" -#include +#include #include #include #include --- a/src/mongo/db/startup_warnings_mongod.cpp +++ b/src/mongo/db/startup_warnings_mongod.cpp @@ -34,6 +34,7 @@ #include "mongo/db/startup_warnings_mongod.h" #include +#include #include #ifndef _WIN32 #include --- a/src/mongo/db/storage/storage_engine_lock_file_posix.cpp +++ b/src/mongo/db/storage/storage_engine_lock_file_posix.cpp @@ -55,7 +55,7 @@ // if called without a fully qualified path it asserts; that makes mongoperf fail. // so make a warning. need a better solution longer term. // massert(40389, str::stream() << "Couldn't find parent dir for file: " << file.string(),); - if (!file.has_branch_path()) { + if (!file.has_parent_path()) { LOGV2(22274, "warning flushMyDirectory couldn't find parent dir for file: {file}", "flushMyDirectory couldn't find parent dir for file", @@ -64,7 +64,7 @@ } - boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts + boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts LOGV2_DEBUG(22275, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string()); --- a/src/mongo/db/storage/storage_engine_metadata.cpp +++ b/src/mongo/db/storage/storage_engine_metadata.cpp @@ -220,7 +220,7 @@ // if called without a fully qualified path it asserts; that makes mongoperf fail. // so make a warning. need a better solution longer term. // massert(13652, str::stream() << "Couldn't find parent dir for file: " << file.string(),); - if (!file.has_branch_path()) { + if (!file.has_parent_path()) { LOGV2(22283, "warning flushMyDirectory couldn't find parent dir for file: {file}", "flushMyDirectory couldn't find parent dir for file", @@ -229,7 +229,7 @@ } - boost::filesystem::path dir = file.branch_path(); // parent_path in new boosts + boost::filesystem::path dir = file.parent_path(); // parent_path in new boosts LOGV2_DEBUG(22284, 1, "flushing directory {dir_string}", "dir_string"_attr = dir.string()); --- a/src/mongo/scripting/engine.cpp +++ b/src/mongo/scripting/engine.cpp @@ -35,6 +35,7 @@ #include #include +#include #include "mongo/base/string_data.h" #include "mongo/client/dbclient_base.h" --- a/src/mongo/shell/shell_utils_launcher.cpp +++ b/src/mongo/shell/shell_utils_launcher.cpp @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -947,26 +948,26 @@ boost::filesystem::directory_iterator i(from); while (i != end) { boost::filesystem::path p = *i; - if (p.leaf() == "metrics.interim" || p.leaf() == "metrics.interim.temp") { + if (p.filename() == "metrics.interim" || p.filename() == "metrics.interim.temp") { // Ignore any errors for metrics.interim* files as these may disappear during copy boost::system::error_code ec; - boost::filesystem::copy_file(p, to / p.leaf(), ec); + boost::filesystem::copy_file(p, to / p.filename(), ec); if (ec) { LOGV2_INFO(22814, "Skipping copying of file from '{from}' to " "'{to}' due to: {error}", "Skipping copying of file due to error" "from"_attr = p.generic_string(), - "to"_attr = (to / p.leaf()).generic_string(), + "to"_attr = (to / p.filename()).generic_string(), "error"_attr = ec.message()); } - } else if (p.leaf() != "mongod.lock" && p.leaf() != "WiredTiger.lock") { + } else if (p.filename() != "mongod.lock" && p.filename() != "WiredTiger.lock") { if (boost::filesystem::is_directory(p)) { - boost::filesystem::path newDir = to / p.leaf(); + boost::filesystem::path newDir = to / p.filename(); boost::filesystem::create_directory(newDir); copyDir(p, newDir); } else { - boost::filesystem::copy_file(p, to / p.leaf()); + boost::filesystem::copy_file(p, to / p.filename()); } } ++i; --- a/src/mongo/shell/shell_utils_launcher.h +++ b/src/mongo/shell/shell_utils_launcher.h @@ -29,7 +29,7 @@ #pragma once -#include +#include #include #include #include