[Boost-commit] svn:boost r76362 - in branches/release: . tools tools/quickbook tools/quickbook/src

Subject: [Boost-commit] svn:boost r76362 - in branches/release: . tools tools/quickbook tools/quickbook/src
From: dnljms_at_[hidden]
Date: 2012-01-08 05:43:09

Author: danieljames
Date: 2012-01-08 05:43:09 EST (Sun, 08 Jan 2012)
New Revision: 76362
URL: http://svn.boost.org/trac/boost/changeset/76362

Log:
Quickbook: Merge windows fix.
Properties modified: 
   branches/release/   (props changed)
   branches/release/tools/   (props changed)
   branches/release/tools/quickbook/   (props changed)
Text files modified: 
   branches/release/tools/quickbook/src/code_snippet.cpp |     8 ++++++--                                
   branches/release/tools/quickbook/src/quickbook.cpp    |     2 +-                                      
   2 files changed, 7 insertions(+), 3 deletions(-)

Modified: branches/release/tools/quickbook/src/code_snippet.cpp
==============================================================================
--- branches/release/tools/quickbook/src/code_snippet.cpp	(original)
+++ branches/release/tools/quickbook/src/code_snippet.cpp	2012-01-08 05:43:09 EST (Sun, 08 Jan 2012)
@@ -528,13 +528,17 @@
         while (snippet_stack) {
             if (qbk_version_n >= 106u) {
                 detail::outerr(source_file->path)
-                    << "Unclosed snippet '" << snippet_stack->id << "'"
+                    << "Unclosed snippet '"
+                    << detail::utf8(snippet_stack->id)
+                    << "'"
                     << std::endl;
                 ++error_count;
             }
             else {
                 detail::outwarn(source_file->path)
-                    << "Unclosed snippet '" << snippet_stack->id << "'"
+                    << "Unclosed snippet '"
+                    << detail::utf8(snippet_stack->id)
+                    << "'"
                     << std::endl;
             }
             

Modified: branches/release/tools/quickbook/src/quickbook.cpp
==============================================================================
--- branches/release/tools/quickbook/src/quickbook.cpp	(original)
+++ branches/release/tools/quickbook/src/quickbook.cpp	2012-01-08 05:43:09 EST (Sun, 08 Jan 2012)
@@ -68,7 +68,7 @@
             if (!info.full) {
                 detail::outerr()
                     << "Error parsing command line definition: '"
-                    << *it
+                    << detail::utf8(*it)
                     << "'"
                     << std::endl;
                 ++actor.error_count;