Skip to content

Update for boost-1.5 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from May 30, 2013
Merged

Update for boost-1.5 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3f8992
Update for boost-1.5
May 29, 2013
f185807
Update include/Config.h.cmake to have correct boost filesystem version.
May 29, 2013
6251374
Add CMake artifacts to gitignore
May 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

3 changes: 1 addition & 2 deletions include/Config.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions src/core/util/FileUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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 (...)
{
Expand All @@ -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 (...)
{
Expand All @@ -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 (...)
{
Expand Down