blob: fa698a3a63c5c0ef1d1dc0de0c7d6a812e0e4690 (
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
|
diff -Naur a/intern/cycles/util/util_cache.cpp b/intern/cycles/util/util_cache.cpp
--- a/intern/cycles/util/util_cache.cpp 2012-05-10 11:44:09.000000000 -0300
+++ b/intern/cycles/util/util_cache.cpp 2012-07-15 14:19:34.893238929 -0300
@@ -26,8 +26,6 @@
#include "util_path.h"
#include "util_types.h"
-#define BOOST_FILESYSTEM_VERSION 2
-
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@ -117,7 +115,7 @@
boost::filesystem::directory_iterator it(dir), it_end;
for(; it != it_end; it++) {
- string filename = it->path().filename();
+ string filename = it->path().filename().string();
if(boost::starts_with(filename, name))
if(except.find(filename) == except.end())
diff -Naur blender-2.63a/intern/cycles/util/util_path.cpp blender-2.63a-new/intern/cycles/util/util_path.cpp
--- a/intern/cycles/util/util_path.cpp 2012-05-10 11:44:09.000000000 -0300
+++ b/intern/cycles/util/util_path.cpp 2012-07-15 14:19:14.126293394 -0300
@@ -26,8 +26,6 @@
#include <stdio.h>
-#define BOOST_FILESYSTEM_VERSION 2
-
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@@ -60,7 +58,7 @@
string path_filename(const string& path)
{
- return boost::filesystem::path(path).filename();
+ return boost::filesystem::path(path).filename().string();
}
string path_dirname(const string& path)
|
