Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 893684 Details for
Bug 932251
dev-db/mongodb-5.0.26 with dev-libs/boost-1.85.0: error: 'directory_iterator' is not a member of 'boost::filesystem'
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
boost-1.85 patch
boost-1.85-fix.patch (text/plain), 7.20 KB, created by
Jura
on 2024-05-21 20:10:43 UTC
(
hide
)
Description:
boost-1.85 patch
Filename:
MIME Type:
Creator:
Jura
Created:
2024-05-21 20:10:43 UTC
Size:
7.20 KB
patch
obsolete
>diff -ru mongo-r5.0.26.old/src/mongo/db/initialize_server_global_state.cpp mongo-r5.0.26/src/mongo/db/initialize_server_global_state.cpp >--- mongo-r5.0.26.old/src/mongo/db/initialize_server_global_state.cpp 2024-03-12 21:50:40.000000000 +0300 >+++ mongo-r5.0.26/src/mongo/db/initialize_server_global_state.cpp 2024-05-21 22:46:10.570855694 +0300 >@@ -34,7 +34,7 @@ > #include "mongo/db/initialize_server_global_state.h" > #include "mongo/db/initialize_server_global_state_gen.h" > >-#include <boost/filesystem/operations.hpp> >+#include <boost/filesystem.hpp> > #include <fmt/format.h> > #include <iostream> > #include <memory> >@@ -328,7 +328,7 @@ > << "\" should name a file, not a directory."); > } > >- if (!serverGlobalParams.logAppend && boost::filesystem::is_regular(absoluteLogpath)) { >+ if (!serverGlobalParams.logAppend && boost::filesystem::is_regular_file(absoluteLogpath)) { > std::string renameTarget = absoluteLogpath + "." + terseCurrentTimeForFilename(); > boost::system::error_code ec; > boost::filesystem::rename(absoluteLogpath, renameTarget, ec); >diff -ru mongo-r5.0.26.old/src/mongo/db/startup_warnings_mongod.cpp mongo-r5.0.26/src/mongo/db/startup_warnings_mongod.cpp >--- mongo-r5.0.26.old/src/mongo/db/startup_warnings_mongod.cpp 2024-03-12 21:50:40.000000000 +0300 >+++ mongo-r5.0.26/src/mongo/db/startup_warnings_mongod.cpp 2024-05-21 22:46:17.427163012 +0300 >@@ -34,6 +34,7 @@ > #include "mongo/db/startup_warnings_mongod.h" > > #include <boost/filesystem/operations.hpp> >+#include <boost/filesystem/exception.hpp> > #include <fstream> > #ifndef _WIN32 > #include <sys/resource.h> >diff -ru mongo-r5.0.26.old/src/mongo/db/storage/storage_engine_lock_file_posix.cpp mongo-r5.0.26/src/mongo/db/storage/storage_engine_lock_file_posix.cpp >--- mongo-r5.0.26.old/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-03-12 21:50:40.000000000 +0300 >+++ mongo-r5.0.26/src/mongo/db/storage/storage_engine_lock_file_posix.cpp 2024-05-21 22:46:08.570766044 +0300 >@@ -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()); > >diff -ru mongo-r5.0.26.old/src/mongo/db/storage/storage_engine_metadata.cpp mongo-r5.0.26/src/mongo/db/storage/storage_engine_metadata.cpp >--- mongo-r5.0.26.old/src/mongo/db/storage/storage_engine_metadata.cpp 2024-03-12 21:50:40.000000000 +0300 >+++ mongo-r5.0.26/src/mongo/db/storage/storage_engine_metadata.cpp 2024-05-21 22:46:13.044966590 +0300 >@@ -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()); > >diff -ru mongo-r5.0.26.old/src/mongo/scripting/engine.cpp mongo-r5.0.26/src/mongo/scripting/engine.cpp >--- mongo-r5.0.26.old/src/mongo/scripting/engine.cpp 2024-03-12 21:50:40.000000000 +0300 >+++ mongo-r5.0.26/src/mongo/scripting/engine.cpp 2024-05-21 22:45:49.779923792 +0300 >@@ -35,6 +35,7 @@ > > #include <algorithm> > #include <boost/filesystem/operations.hpp> >+#include <boost/filesystem/directory.hpp> > > #include "mongo/base/string_data.h" > #include "mongo/client/dbclient_base.h" >diff -ru mongo-r5.0.26.old/src/mongo/shell/shell_utils_launcher.cpp mongo-r5.0.26/src/mongo/shell/shell_utils_launcher.cpp >--- mongo-r5.0.26.old/src/mongo/shell/shell_utils_launcher.cpp 2024-03-12 21:50:40.000000000 +0300 >+++ mongo-r5.0.26/src/mongo/shell/shell_utils_launcher.cpp 2024-05-21 22:46:03.987560613 +0300 >@@ -39,6 +39,7 @@ > #include <boost/iostreams/stream.hpp> > #include <boost/iostreams/stream_buffer.hpp> > #include <boost/iostreams/tee.hpp> >+#include <boost/filesystem.hpp> > #include <fcntl.h> > #include <fmt/format.h> > #include <iostream> >@@ -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; >diff -ru mongo-r5.0.26.old/src/mongo/shell/shell_utils_launcher.h mongo-r5.0.26/src/mongo/shell/shell_utils_launcher.h >--- mongo-r5.0.26.old/src/mongo/shell/shell_utils_launcher.h 2024-03-12 21:50:40.000000000 +0300 >+++ mongo-r5.0.26/src/mongo/shell/shell_utils_launcher.h 2024-05-21 22:48:46.067825645 +0300 >@@ -29,7 +29,7 @@ > > #pragma once > >-#include <boost/filesystem/convenience.hpp> >+#include <boost/filesystem/path.hpp> > #include <map> > #include <sstream> > #include <string>
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 932251
:
893464
| 893684 |
895145