Merge pull request #35 from upthere/boost-1.5x

Update for boost-1.5

Author: Alan Wright

.gitignore

@@ -54,3 +54,30 @@ src/demo/searchfiles/msvc/Release DLL
 src/demo/searchfiles/msvc/Release Static
 src/demo/searchfiles/msvc/Debug DLL
 src/demo/searchfiles/msvc/Debug Static
+CMakeCache.txt
+CMakeFiles/
+CTestTestfile.cmake
+Makefile
+cmake_install.cmake
+cmake_uninstall.cmake
+include/Config.h
+install_manifest.txt
+liblucene++-contrib.pc
+liblucene++.pc
+src/contrib/CMakeFiles/
+src/contrib/CTestTestfile.cmake
+src/contrib/Makefile
+src/contrib/cmake_install.cmake
+src/core/CMakeFiles/
+src/core/CTestTestfile.cmake
+src/core/Makefile
+src/core/cmake_install.cmake
+src/demo/CMakeFiles/
+src/demo/CTestTestfile.cmake
+src/demo/Makefile
+src/demo/cmake_install.cmake
+src/test/CMakeFiles/
+src/test/CTestTestfile.cmake
+src/test/Makefile
+src/test/cmake_install.cmake
+

include/Config.h.cmake

@@ -90,7 +90,6 @@
 // Make internal bitset storage public
 #define BOOST_DYNAMIC_BITSET_DONT_USE_FRIENDS
 
-// Force boost file-system version 2 for later boost versions > 1.46
-#define BOOST_FILESYSTEM_VERSION 2
+#define BOOST_FILESYSTEM_VERSION 3
 
 #endif

src/core/util/FileUtils.cpp

@@ -164,10 +164,10 @@ namespace Lucene
         {
             try
             {
-                for (boost::filesystem::wdirectory_iterator dir(path.c_str()); dir != boost::filesystem::wdirectory_iterator(); ++dir)
+                for (boost::filesystem::directory_iterator dir(path.c_str()); dir != boost::filesystem::directory_iterator(); ++dir)
                 {
                     if (!filesOnly || !boost::filesystem::is_directory(dir->status()))
-                        dirList.add(dir->path().filename().c_str());
+                        dirList.add(dir->path().filename().wstring().c_str());
                 }
                 return true;
             }
@@ -202,9 +202,9 @@ namespace Lucene
         {
             try
             {
-                boost::filesystem::wpath join(path.c_str());
+                boost::filesystem::path join(path.c_str());
                 join /= file.c_str();
-                return join.directory_string().c_str();
+                return join.wstring().c_str();
             }
             catch (...)
             {
@@ -217,7 +217,7 @@ namespace Lucene
             try
             {
                 boost::filesystem::wpath parentPath(path.c_str());
-                return parentPath.parent_path().directory_string().c_str();
+                return parentPath.parent_path().wstring().c_str();
             }
             catch (...)
             {
@@ -230,7 +230,7 @@ namespace Lucene
             try
             {
                 boost::filesystem::wpath fileName(path.c_str());
-                return fileName.filename().c_str();
+                return fileName.filename().wstring().c_str();
             }
             catch (...)
             {