[Boost-commit] svn:boost r70976 - branches/quickbook-dev/tools/quickbook/src

Subject: [Boost-commit] svn:boost r70976 - branches/quickbook-dev/tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2011-04-04 18:10:21

Author: danieljames
Date: 2011-04-04 18:10:20 EDT (Mon, 04 Apr 2011)
New Revision: 70976
URL: http://svn.boost.org/trac/boost/changeset/70976

Log:
Quickbook: merge from trunk.
Text files modified: 
   branches/quickbook-dev/tools/quickbook/src/actions.cpp      |     2 +-                                      
   branches/quickbook-dev/tools/quickbook/src/actions.hpp      |     2 +-                                      
   branches/quickbook-dev/tools/quickbook/src/code_snippet.cpp |     4 ++--                                    
   3 files changed, 4 insertions(+), 4 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/src/actions.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.cpp	2011-04-04 18:10:20 EDT (Mon, 04 Apr 2011)
@@ -1826,7 +1826,7 @@
         std::string ext = paths.filename.extension().generic_string();
         std::vector<template_symbol> storage;
         actions.error_count +=
-            load_snippets(paths.filename.string(), storage, ext, load_type);
+            load_snippets(paths.filename, storage, ext, load_type);
 
         if (load_type == block_tags::import)
         {

Modified: branches/quickbook-dev/tools/quickbook/src/actions.hpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/actions.hpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/actions.hpp	2011-04-04 18:10:20 EDT (Mon, 04 Apr 2011)
@@ -52,7 +52,7 @@
         return quickbook_range(0, max_);
     }
 
-    int load_snippets(std::string const& file, std::vector<template_symbol>& storage,
+    int load_snippets(fs::path const& file, std::vector<template_symbol>& storage,
         std::string const& extension, value::tag_type load_type);
 
     std::string syntax_highlight(

Modified: branches/quickbook-dev/tools/quickbook/src/code_snippet.cpp
==============================================================================
--- branches/quickbook-dev/tools/quickbook/src/code_snippet.cpp	(original)
+++ branches/quickbook-dev/tools/quickbook/src/code_snippet.cpp	2011-04-04 18:10:20 EDT (Mon, 04 Apr 2011)
@@ -25,7 +25,7 @@
     struct code_snippet_actions
     {
         code_snippet_actions(std::vector<template_symbol>& storage,
-                                 std::string const& filename,
+                                 fs::path const& filename,
                                  char const* source_type)
             : callout_id(0)
             , storage(storage)
@@ -310,7 +310,7 @@
     };
 
     int load_snippets(
-        std::string const& file
+        fs::path const& file
       , std::vector<template_symbol>& storage   // snippets are stored in a
                                                 // vector of template_symbols
       , std::string const& extension