[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48836] trunk/blender/intern/cycles/util: Patch #32074: Fix compilation with boost 1.50

[Sergey Sharybin]

Revision: 48836
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48836
Author:   nazgul
Date:     2012-07-11 14:48:47 +0000 (Wed, 11 Jul 2012)
Log Message:
-----------
Patch #32074: Fix compilation with boost 1.50

This patch switches from boost's filesystem v2 to v3.

This should be completely smooth due to filesystem v3 is pretty
old already.

Patch by Sven-Hendrik Haase (aka svenstaro), thanks!

Modified Paths:
--------------
    trunk/blender/intern/cycles/util/util_cache.cpp
    trunk/blender/intern/cycles/util/util_path.cpp

Modified: trunk/blender/intern/cycles/util/util_cache.cpp
===================================================================
--- trunk/blender/intern/cycles/util/util_cache.cpp     2012-07-11 12:51:06 UTC 
(rev 48835)
+++ trunk/blender/intern/cycles/util/util_cache.cpp     2012-07-11 14:48:47 UTC 
(rev 48836)
@@ -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())

Modified: trunk/blender/intern/cycles/util/util_path.cpp
===================================================================
--- trunk/blender/intern/cycles/util/util_path.cpp      2012-07-11 12:51:06 UTC 
(rev 48835)
+++ trunk/blender/intern/cycles/util/util_path.cpp      2012-07-11 14:48:47 UTC 
(rev 48836)
@@ -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)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs