blob: 0a6e6e8869e8c3314f04f87b5d793cc2c81c2433 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
commit 65222c3c4f800b624e1d547ab7f1eb28e3d6ee59
Author: Stefan Strogin <stefan@steils.org>
Date: Mon May 27 16:13:09 2024 +0000
Fix build for boost 1.85.0, #42
diff --git a/dom/include/dae.h b/dom/include/dae.h
index e53388b..03e72f9 100644
--- a/dom/include/dae.h
+++ b/dom/include/dae.h
@@ -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)
diff --git a/dom/src/dae/daeUtils.cpp b/dom/src/dae/daeUtils.cpp
index de30ca0..45b667f 100644
--- a/dom/src/dae/daeUtils.cpp
+++ b/dom/src/dae/daeUtils.cpp
@@ -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
diff --git a/dom/src/dae/daeZAEUncompressHandler.cpp b/dom/src/dae/daeZAEUncompressHandler.cpp
index da2a344..2550000 100644
--- a/dom/src/dae/daeZAEUncompressHandler.cpp
+++ b/dom/src/dae/daeZAEUncompressHandler.cpp
@@ -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();
|
