SF.net SVN: openvrml:[4285] trunk

[<br...@us...>]

Revision: 4285
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4285&view=rev
Author:   braden
Date:     2012-05-01 05:29:53 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Boost.Filesystem 3 doesn't have path::external_file_string; use generic_string instead.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-05-01 05:16:04 UTC (rev 4284)
+++ trunk/ChangeLog	2012-05-01 05:29:53 UTC (rev 4285)
@@ -1,5 +1,13 @@
 2012-05-01 Braden McDaniel  <br...@en...>
 
+	* src/local/libopenvrml-dl/openvrml/local/dl.cpp
+	(foreachfile(const std::vector<boost::filesystem::path> &, int
+	(*)(const std::string &, void *), void *)): Boost.Filesystem 3
+	doesn't have path::external_file_string; use generic_string
+	instead.
+
+2012-05-01 Braden McDaniel  <br...@en...>
+
 	* src/libopenvrml-gl/openvrml-gl.vcxproj: Generate openvrml-gl.lib
 	into arch-specific subdirectory.
 

Modified: trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp
===================================================================
--- trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2012-05-01 05:16:04 UTC (rev 4284)
+++ trunk/src/local/libopenvrml-dl/openvrml/local/dl.cpp	2012-05-01 05:29:53 UTC (rev 4285)
@@ -75,7 +75,7 @@
         for (directory_iterator entry(*dir);
              entry != directory_iterator();
              ++entry) {
-            result = (func)(entry->path().external_file_string(), data);
+            result = (func)(entry->path().generic_string(), data);
             if (result != 0) { return result; }
         }
     } catch (boost::filesystem::filesystem_error &) {}
@@ -144,7 +144,7 @@
                                           reinterpret_cast<LPSTR>(&buf),
                                           buf_size,
                                           args);
-    assert(buf_chars != 0); // If FormatMessage failed, just give up.
+    assert(buf_chars != DWORD(0)); // If FormatMessage failed, just give up.
     const std::string buf_str(buf ? buf : "");
     return buf_str;
 # else

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.