Skip to content

Fix build for boost 1.85.0, #42 #43

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

Open
steils wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build for boost 1.85.0, #42 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dom/include/dae.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#pragma warning(disable: 4180 4245)
#endif
#ifndef NO_BOOST
#include <boost/filesystem/convenience.hpp>
#include <boost/filesystem.hpp>
#endif
#ifdef _MSC_VER
#pragma warning(pop)
Expand Down
2 changes: 1 addition & 1 deletion dom/src/dae/daeUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#endif

#ifndef NO_BOOST
#include <boost/filesystem/convenience.hpp> // THIS WAS NOT COMMENTED.
#include <boost/filesystem.hpp> // THIS WAS NOT COMMENTED.
#endif

#include <cstdio> // for tmpnam
Expand Down
2 changes: 1 addition & 1 deletion dom/src/dae/daeZAEUncompressHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ bool daeZAEUncompressHandler::checkAndExtractInternalArchive( const std::string&
bool error = false;

boost::filesystem::path archivePath(filePath);
std::string dir = archivePath.branch_path().string();
std::string dir = archivePath.parent_path().string();

const std::string& randomSegment = cdom::getRandomFileName();
std::string tmpDir = dir + cdom::getFileSeparator() + randomSegment + cdom::getFileSeparator();
Expand Down