[Boost-commit] svn:boost r83956 - in branches/release/tools/auto_index: . src

Subject: [Boost-commit] svn:boost r83956 - in branches/release/tools/auto_index: . src
From: john_at_[hidden]
Date: 2013-04-18 11:52:12

Author: johnmaddock
Date: 2013-04-18 11:52:11 EDT (Thu, 18 Apr 2013)
New Revision: 83956
URL: http://svn.boost.org/trac/boost/changeset/83956

Log:
Merge fixes in Trunk.
Properties modified: 
   branches/release/tools/auto_index/   (props changed)
Text files modified: 
   branches/release/tools/auto_index/src/auto_index.cpp |     3 +++                                     
   1 files changed, 3 insertions(+), 0 deletions(-)

Modified: branches/release/tools/auto_index/src/auto_index.cpp
==============================================================================
--- branches/release/tools/auto_index/src/auto_index.cpp	(original)
+++ branches/release/tools/auto_index/src/auto_index.cpp	2013-04-18 11:52:11 EDT (Thu, 18 Apr 2013)
@@ -94,6 +94,8 @@
 {
    while((id->id == 0) && (id->prev))
       id = id->prev;
+   if(!id->id)
+      BOOST_THROW_EXCEPTION(std::runtime_error("Current XML block has no enclosing ID: XML is not valid Boostbook?"));
    return id->id;
 }
 //
@@ -762,6 +764,7 @@
    catch(boost::exception& e)
    {
       std::cerr << diagnostic_information(e);
+      return 1;
    }
    catch(const std::exception& e)
    {