[Boost-commit] svn:boost r68391 - branches/quickbook-filenames/tools/quickbook/src

Subject: [Boost-commit] svn:boost r68391 - branches/quickbook-filenames/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-01-23 11:41:10

Author: danieljames
Date: 2011-01-23 11:41:05 EST (Sun, 23 Jan 2011)
New Revision: 68391
URL: http://svn.boost.org/trac/boost/changeset/68391

Log:
Use generic string for `__FILENAME__`.

Will hopefully a bit more consistent across platforms. Obviously proper
conversion to UTF-8 would be better.
Text files modified: 
   branches/quickbook-filenames/tools/quickbook/src/actions.cpp       |     2 +-                                      
   branches/quickbook-filenames/tools/quickbook/src/actions_class.cpp |     2 +-                                      
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: branches/quickbook-filenames/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/actions.cpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/actions.cpp	2011-01-23 11:41:05 EST (Sun, 23 Jan 2011)
@@ -1414,7 +1414,7 @@
         }
 
         // update the __FILENAME__ macro
-        *boost::spirit::classic::find(actions.macro, "__FILENAME__") = actions.filename.string();
+        *boost::spirit::classic::find(actions.macro, "__FILENAME__") = actions.filename.generic_string();
 
         // parse the file
         quickbook::parse_file(actions.filename.string().c_str(), actions, true);

Modified: branches/quickbook-filenames/tools/quickbook/src/actions_class.cpp
==============================================================================
--- branches/quickbook-filenames/tools/quickbook/src/actions_class.cpp	(original)
+++ branches/quickbook-filenames/tools/quickbook/src/actions_class.cpp	2011-01-23 11:41:05 EST (Sun, 23 Jan 2011)
@@ -206,7 +206,7 @@
         // turn off __FILENAME__ macro on debug mode = true
         std::string filename_str = debug_mode ?
             std::string("NO_FILENAME_MACRO_GENERATED_IN_DEBUG_MODE") :
-            filename.string();
+            filename.generic_string();
 
         // add the predefined macros
         macro.add