Subject: [Boost-commit] svn:boost r67378 - in trunk/boost/spirit/home/support/utree: . detail
From: hartmut.kaiser_at_[hidden]
Date: 2010-12-20 21:49:21
Author: hkaiser
Date: 2010-12-20 21:48:59 EST (Mon, 20 Dec 2010)
New Revision: 67378
URL: http://svn.boost.org/trac/boost/changeset/67378
Log:
Spirit: more utree fixes
Text files modified:
trunk/boost/spirit/home/support/utree/detail/utree_detail1.hpp | 4 ++--
trunk/boost/spirit/home/support/utree/detail/utree_detail2.hpp | 11 +++--------
trunk/boost/spirit/home/support/utree/operators.hpp | 6 +++---
trunk/boost/spirit/home/support/utree/utree_traits.hpp | 6 +++---
4 files changed, 11 insertions(+), 16 deletions(-)
Modified: trunk/boost/spirit/home/support/utree/detail/utree_detail1.hpp
==============================================================================
--- trunk/boost/spirit/home/support/utree/detail/utree_detail1.hpp (original)
+++ trunk/boost/spirit/home/support/utree/detail/utree_detail1.hpp 2010-12-20 21:48:59 EST (Mon, 20 Dec 2010)
@@ -1,6 +1,6 @@
/*=============================================================================
- Copyright (c) 2001-2010 Joel de Guzman
- Copyright (c) 2001-2010 Hartmut Kaiser
+ Copyright (c) 2001-2011 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
Modified: trunk/boost/spirit/home/support/utree/detail/utree_detail2.hpp
==============================================================================
--- trunk/boost/spirit/home/support/utree/detail/utree_detail2.hpp (original)
+++ trunk/boost/spirit/home/support/utree/detail/utree_detail2.hpp 2010-12-20 21:48:59 EST (Mon, 20 Dec 2010)
@@ -1,6 +1,6 @@
/*=============================================================================
- Copyright (c) 2001-2010 Joel de Guzman
- Copyright (c) 2001-2010 Hartmut Kaiser
+ Copyright (c) 2001-2011 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -1200,11 +1200,6 @@
inline bool utree::empty() const
{
type::info t = get_type();
- if (t == type::uninitialized_type)
- {
- boost::throw_exception(bad_type_exception());
- return false;
- }
if (t == type::reference_type)
return ((utree const*)p)->empty();
@@ -1213,7 +1208,7 @@
if (t == type::list_type)
return l.size == 0;
- return t == type::nil_type;
+ return t == type::nil_type || t == type::uninitialized_type;
}
inline std::size_t utree::size() const
Modified: trunk/boost/spirit/home/support/utree/operators.hpp
==============================================================================
--- trunk/boost/spirit/home/support/utree/operators.hpp (original)
+++ trunk/boost/spirit/home/support/utree/operators.hpp 2010-12-20 21:48:59 EST (Mon, 20 Dec 2010)
@@ -1,6 +1,6 @@
/*=============================================================================
- Copyright (c) 2001-2010 Joel de Guzman
- Copyright (c) 2001-2010 Hartmut Kaiser
+ Copyright (c) 2001-2011 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -206,7 +206,7 @@
void operator()(boost::spirit::uninitialized_type) const
{
- out << "uninitialized ";
+ out << "<uninitialized> ";
}
void operator()(boost::spirit::nil_type) const
Modified: trunk/boost/spirit/home/support/utree/utree_traits.hpp
==============================================================================
--- trunk/boost/spirit/home/support/utree/utree_traits.hpp (original)
+++ trunk/boost/spirit/home/support/utree/utree_traits.hpp 2010-12-20 21:48:59 EST (Mon, 20 Dec 2010)
@@ -1,7 +1,7 @@
/*=============================================================================
- Copyright (c) 2001-2010 Joel de Guzman
- Copyright (c) 2001-2010 Hartmut Kaiser
- Copyright (c) 2010 Bryce Lelbach
+ Copyright (c) 2001-2011 Joel de Guzman
+ Copyright (c) 2001-2011 Hartmut Kaiser
+ Copyright (c) 2011 Bryce Lelbach
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)