--- mongodb-src-r1.8.1/db/db.cpp.boost_146~ 2011-04-06 06:40:13.000000000 +0200
+++ mongodb-src-r1.8.1/db/db.cpp 2011-05-03 16:31:00.374416024 +0200
@@ -390,7 +390,7 @@ sendmore:
boost::filesystem::path path( dbpath );
for ( boost::filesystem::directory_iterator i( path );
i != boost::filesystem::directory_iterator(); ++i ) {
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).filename().string();
if ( boost::filesystem::is_directory( *i ) &&
fileName.length() && fileName[ 0 ] == '$' )
boost::filesystem::remove_all( *i );
@@ -725,9 +725,10 @@ int main(int argc, char* argv[]) {
dbExecCommand = argv[0];
srand(curTimeMicros());
-#if( BOOST_VERSION >= 104500 )
+
+#if( BOOST_VERSION >= 104500 && BOOST_VERSION < 104600 )
boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
-#else
+#elif BOOST_VERSION < 104500
boost::filesystem::path::default_name_check( boost::filesystem::no_check );
#endif
--- mongodb-src-r1.8.1/db/dur_journal.cpp.boost_146~ 2011-04-06 06:40:13.000000000 +0200
+++ mongodb-src-r1.8.1/db/dur_journal.cpp 2011-05-03 16:31:00.375416011 +0200
@@ -123,7 +123,7 @@ namespace mongo {
for ( boost::filesystem::directory_iterator i( getJournalDir() );
i != boost::filesystem::directory_iterator();
++i ) {
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).filename().string();
if( str::startsWith(fileName, "j._") )
return true;
}
@@ -139,7 +139,7 @@ namespace mongo {
for ( boost::filesystem::directory_iterator i( getJournalDir() );
i != boost::filesystem::directory_iterator();
++i ) {
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).filename().string();
if( str::startsWith(fileName, "j._") ) {
try {
removeOldJournalFile(*i);
--- mongodb-src-r1.8.1/db/dur_recover.cpp.boost_146~ 2011-04-06 06:40:13.000000000 +0200
+++ mongodb-src-r1.8.1/db/dur_recover.cpp 2011-05-03 16:31:00.384415898 +0200
@@ -67,7 +67,7 @@ namespace mongo {
i != filesystem::directory_iterator();
++i ) {
filesystem::path filepath = *i;
- string fileName = filesystem::path(*i).leaf();
+ string fileName = filesystem::path(*i).filename().string();
if( str::startsWith(fileName, "j._") ) {
unsigned u = str::toUnsigned( str::after(fileName, '_') );
if( m.count(u) ) {
@@ -80,7 +80,7 @@ namespace mongo {
if( i != m.begin() && m.count(i->first - 1) == 0 ) {
uasserted(13532,
str::stream() << "unexpected file in journal directory " << dir.string()
- << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file");
+ << " : " << filesystem::path(i->second).filename().string() << " : can't find its preceeding file");
}
files.push_back(i->second);
}
--- mongodb-src-r1.8.1/db/instance.cpp.boost_146~ 2011-04-06 06:40:13.000000000 +0200
+++ mongodb-src-r1.8.1/db/instance.cpp 2011-05-03 16:31:00.394415773 +0200
@@ -610,13 +610,13 @@ namespace mongo {
i != boost::filesystem::directory_iterator(); ++i ) {
if ( directoryperdb ) {
boost::filesystem::path p = *i;
- string dbName = p.leaf();
+ string dbName = p.filename().string();
p /= ( dbName + ".ns" );
if ( MMF::exists( p ) )
names.push_back( dbName );
}
else {
- string fileName = boost::filesystem::path(*i).leaf();
+ string fileName = boost::filesystem::path(*i).filename().string();
if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" )
names.push_back( fileName.substr( 0, fileName.length() - 3 ) );
}
@@ -848,7 +848,7 @@ namespace mongo {
}
void acquirePathLock() {
- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
bool oldFile = false;
--- mongodb-src-r1.8.1/db/pdfile.cpp.boost_146~ 2011-04-06 06:40:13.000000000 +0200
+++ mongodb-src-r1.8.1/db/pdfile.cpp 2011-05-03 16:31:00.405415637 +0200
@@ -1815,7 +1815,7 @@ namespace mongo {
virtual bool apply( const Path &p ) {
if ( !boost::filesystem::exists( p ) )
return false;
- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) );
+ boostRenameWrapper( p, newPath_ / ( p.filename().string() + ".bak" ) );
return true;
}
virtual const char * op() const {
@@ -1936,7 +1936,7 @@ namespace mongo {
uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
"backup" : "$tmp" );
BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
- string reservedPathString = reservedPath.native_directory_string();
+ string reservedPathString = reservedPath.string();
bool res;
{
--- mongodb-src-r1.8.1/pch.h.boost_146~ 2011-04-06 06:40:13.000000000 +0200
+++ mongodb-src-r1.8.1/pch.h 2011-05-03 16:31:00.414415524 +0200
@@ -72,7 +72,7 @@
#include <boost/any.hpp>
#include "boost/thread/once.hpp"
#include <boost/archive/iterators/transform_width.hpp>
-#define BOOST_FILESYSTEM_VERSION 2
+#define BOOST_FILESYSTEM_VERSION 3
#include <boost/filesystem/convenience.hpp>
#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/operations.hpp>
--- mongodb-src-r1.8.1/shell/shell_utils.cpp.boost_146~ 2011-05-03 16:48:23.964369354 +0200
+++ mongodb-src-r1.8.1/shell/shell_utils.cpp 2011-05-03 16:48:54.172991694 +0200
@@ -400,7 +400,7 @@ namespace mongo {
#endif
}
- argv_.push_back( programPath.native_file_string() );
+ argv_.push_back( programPath.string() );
port_ = -1;
--- mongodb-src-r1.8.1/tools/restore.cpp.boost_146~ 2011-05-04 00:21:39.560377617 +0200
+++ mongodb-src-r1.8.1/tools/restore.cpp 2011-05-04 00:21:43.413329449 +0200
@@ -121,7 +121,7 @@ public:
log(2) << "drillDown: " << root.string() << endl;
// skip hidden files and directories
- if (root.leaf()[0] == '.' && root.leaf() != ".")
+ if (root.filename().string().c_str()[0] == '.' && root.filename().string() != ".")
return;
if ( is_directory( root ) ) {
@@ -200,7 +200,7 @@ public:
ns += "." + _coll;
}
else {
- string l = root.leaf();
+ string l = root.filename().string();
l = l.substr( 0 , l.find_last_of( "." ) );
ns += "." + l;
}
--- mongodb-src-r1.8.1/tools/tool.cpp.boost_146~ 2011-04-06 06:40:13.000000000 +0200
+++ mongodb-src-r1.8.1/tools/tool.cpp 2011-05-03 16:31:00.414415524 +0200
@@ -101,9 +101,9 @@ namespace mongo {
// we want durability to be disabled.
cmdLine.dur = false;
-#if( BOOST_VERSION >= 104500 )
+#if( BOOST_VERSION >= 104500 && BOOST_VERSION < 104600 )
boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
-#else
+#elif BOOST_VERSION < 104500
boost::filesystem::path::default_name_check( boost::filesystem::no_check );
#endif
