[Boost-commit] svn:boost r70193 - in trunk/tools/quickbook: . src

Subject: [Boost-commit] svn:boost r70193 - in trunk/tools/quickbook: . src
From: dnljms_at_[hidden]
Date: 2011-03-19 11:54:22

Author: danieljames
Date: 2011-03-19 11:54:21 EDT (Sat, 19 Mar 2011)
New Revision: 70193
URL: http://svn.boost.org/trac/boost/changeset/70193

Log:
Quickbook: some fixes for Visual C++.
Properties modified: 
   trunk/tools/quickbook/   (props changed)
Text files modified: 
   trunk/tools/quickbook/src/actions.cpp    |     6 ++++--                                  
   trunk/tools/quickbook/src/value_tags.hpp |     4 ++--                                    
   2 files changed, 6 insertions(+), 4 deletions(-)

Modified: trunk/tools/quickbook/src/actions.cpp
==============================================================================
--- trunk/tools/quickbook/src/actions.cpp	(original)
+++ trunk/tools/quickbook/src/actions.cpp	2011-03-19 11:54:21 EDT (Sat, 19 Mar 2011)
@@ -187,7 +187,7 @@
             boost::lexical_cast<std::string>(pos.column));
 
         detail::outerr(actions.filename, pos.line)
-            << formatted_message << std::endl;
+            << detail::utf8(formatted_message) << std::endl;
         ++actions.error_count;
     }
 
@@ -637,7 +637,9 @@
             if(!attributes.insert(std::make_pair(name.get_quickbook(), value)).second)
             {
                 detail::outwarn(actions.filename, name.get_position().line)
-                    << "Duplicate image attribute: " << name.get_quickbook() << std::endl;
+                    << "Duplicate image attribute: "
+                    << detail::utf8(name.get_quickbook())
+                    << std::endl;
             }
         }
         

Modified: trunk/tools/quickbook/src/value_tags.hpp
==============================================================================
--- trunk/tools/quickbook/src/value_tags.hpp	(original)
+++ trunk/tools/quickbook/src/value_tags.hpp	2011-03-19 11:54:21 EDT (Sat, 19 Mar 2011)
@@ -30,7 +30,7 @@
                 return "null"; \
             BOOST_PP_SEQ_FOR_EACH(QUICKBOOK_VALUE_CASE, _, values) \
             default: \
-                assert(false); \
+                assert(false); return ""; \
             }; \
         } \
         \
@@ -55,7 +55,7 @@
                 return "null"; \
             BOOST_PP_SEQ_FOR_EACH(QUICKBOOK_VALUE_NAMED_CASE, _, values) \
             default: \
-                assert(false); \
+                assert(false); return ""; \
             }; \
         } \
         \