From c49fedccc8ec55971fb90b727cc06ad6cfaf8eeb Mon Sep 17 00:00:00 2001
From: Stephen Roderick <kiwi.net@mac.com>
Date: Sat, 23 Apr 2011 08:00:57 -0400
Subject: [PATCH 1/5] os: Cope with boost filesystem v3 changes

---
 src/os/PluginLoader.cpp |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/os/PluginLoader.cpp b/src/os/PluginLoader.cpp
index 08b6e9e..a1485d4 100644
--- a/src/os/PluginLoader.cpp
+++ b/src/os/PluginLoader.cpp
@@ -44,6 +44,13 @@ static const std::string delimiters(":;");
 static const std::string default_delimiter(":");
 # endif
 
+// deal with boost v2/v3 filename differences
+#if (3==BOOST_FILESYSTEM_VERSION)
+#   define FILENAME()   filename().string()
+#else
+#   define FILENAME()   filename()
+#endif
+
 
 namespace {
     /**
@@ -153,7 +160,7 @@ void PluginLoader::loadPluginsInternal( std::string const& path_list, std::strin
             {
                 log(Debug) << "Scanning file " << itr->path().string() << " ...";
                 if (is_regular_file(itr->status()) && itr->path().extension() == SO_EXT ) {
-                    loadInProcess( itr->path().string(), makeShortFilename(itr->path().filename() ), kind, true);
+                    loadInProcess( itr->path().string(), makeShortFilename(itr->path().FILENAME() ), kind, true);
                 } else {
                     if (!is_regular_file(itr->status()))
                         log(Debug) << "not a regular file: ignored."<<endlog();
@@ -174,7 +181,7 @@ void PluginLoader::loadPluginsInternal( std::string const& path_list, std::strin
             {
                 log(Debug) << "Scanning file " << itr->path().string() << " ...";
                 if (is_regular_file(itr->status()) && itr->path().extension() == SO_EXT ) {
-                    loadInProcess( itr->path().string(), makeShortFilename(itr->path().filename() ), kind, true);
+                    loadInProcess( itr->path().string(), makeShortFilename(itr->path().FILENAME() ), kind, true);
                 } else {
                     if (!is_regular_file(itr->status()))
                         log(Debug) << "not a regular file: ignored."<<endlog();
@@ -271,7 +278,7 @@ bool PluginLoader::loadInProcess(string file, string shortname, string kind, boo
     }
 
     //------------- if you get here, the library has been loaded -------------
-    string libname = p.filename();
+    string libname = p.FILENAME();
     log(Debug)<<"Found library "<<libname<<endlog();
     LoadedLib loading_lib(libname,shortname,handle);
     dlerror();    /* Clear any existing error */
-- 
1.7.4.4