[Boost-commit] svn:boost r67908 - trunk/tools/quickbook/src

Subject: [Boost-commit] svn:boost r67908 - trunk/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-01-10 03:23:29

Author: danieljames
Date: 2011-01-10 03:23:27 EST (Mon, 10 Jan 2011)
New Revision: 67908
URL: http://svn.boost.org/trac/boost/changeset/67908

Log:
Fix quickbook windows compile error. Refs #5055.

Patch by Joshua Boyce. Thanks.
Text files modified: 
   trunk/tools/quickbook/src/actions.cpp          |     4 ++--                                    
   trunk/tools/quickbook/src/actions_class.cpp    |     2 +-                                      
   trunk/tools/quickbook/src/doc_info_actions.cpp |     8 ++++----                                
   3 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/tools/quickbook/src/actions.cpp
==============================================================================
--- trunk/tools/quickbook/src/actions.cpp	(original)
+++ trunk/tools/quickbook/src/actions.cpp	2011-01-10 03:23:27 EST (Mon, 10 Jan 2011)
@@ -1414,10 +1414,10 @@
         }
 
         // update the __FILENAME__ macro
-        *boost::spirit::classic::find(actions.macro, "__FILENAME__") = actions.filename.native();
+        *boost::spirit::classic::find(actions.macro, "__FILENAME__") = actions.filename.string();
 
         // parse the file
-        quickbook::parse_file(actions.filename.native().c_str(), actions, true);
+        quickbook::parse_file(actions.filename.string().c_str(), actions, true);
 
         // restore the values
         std::swap(actions.filename, filein);

Modified: trunk/tools/quickbook/src/actions_class.cpp
==============================================================================
--- trunk/tools/quickbook/src/actions_class.cpp	(original)
+++ trunk/tools/quickbook/src/actions_class.cpp	2011-01-10 03:23:27 EST (Mon, 10 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.native();
+            filename.string();
 
         // add the predefined macros
         macro.add

Modified: trunk/tools/quickbook/src/doc_info_actions.cpp
==============================================================================
--- trunk/tools/quickbook/src/doc_info_actions.cpp	(original)
+++ trunk/tools/quickbook/src/doc_info_actions.cpp	2011-01-10 03:23:27 EST (Mon, 10 Jan 2011)
@@ -77,7 +77,7 @@
             qbk_major_version = 1;
             qbk_minor_version = 1;
             qbk_version_n = 101;
-            detail::outwarn(actions.filename.native(),1)
+            detail::outwarn(actions.filename.string(),1)
                 << "Warning: Quickbook version undefined. "
                 "Version 1.1 is assumed" << std::endl;
         }
@@ -89,13 +89,13 @@
         
         if (qbk_version_n == 106)
         {
-            detail::outwarn(actions.filename.native(),1)
+            detail::outwarn(actions.filename.string(),1)
                 << "Quickbook 1.6 is still under development and is "
                 "likely to change in the future." << std::endl;
         }
         else if(qbk_version_n < 100 || qbk_version_n > 106)
         {
-            detail::outerr(actions.filename.native(),1)
+            detail::outerr(actions.filename.string(),1)
                 << "Unknown version of quickbook: quickbook "
                 << qbk_major_version
                 << "."
@@ -121,7 +121,7 @@
 
             if(!invalid_attributes.empty())
             {
-                detail::outwarn(actions.filename.native(),1)
+                detail::outwarn(actions.filename.string(),1)
                     << (invalid_attributes.size() > 1 ?
                         "Invalid attributes" : "Invalid attribute")
                     << " for '" << actions.doc_type << " document info': "