Subject: [Boost-commit] svn:boost r61863 - in branches/release: boost/property_tree boost/property_tree/detail libs/property_tree
From: dgregor_at_[hidden]
Date: 2010-05-08 21:04:00
Author: dgregor
Date: 2010-05-08 21:03:59 EDT (Sat, 08 May 2010)
New Revision: 61863
URL: http://svn.boost.org/trac/boost/changeset/61863
Log:
Merge standards conformance fixes for Boost.PropertyTree
Properties modified:
branches/release/boost/property_tree/ (props changed)
branches/release/libs/property_tree/ (props changed)
Text files modified:
branches/release/boost/property_tree/detail/ptree_implementation.hpp | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
Modified: branches/release/boost/property_tree/detail/ptree_implementation.hpp
==============================================================================
--- branches/release/boost/property_tree/detail/ptree_implementation.hpp (original)
+++ branches/release/boost/property_tree/detail/ptree_implementation.hpp 2010-05-08 21:03:59 EDT (Sat, 08 May 2010)
@@ -480,14 +480,16 @@
typename basic_ptree<K, D, C>::iterator
basic_ptree<K, D, C>::to_iterator(assoc_iterator ai)
{
- return iterator(subs::ch(this).project<0>(ai.base()));
+ return iterator(subs::ch(this).
+ BOOST_NESTED_TEMPLATE project<0>(ai.base()));
}
template<class K, class D, class C> inline
typename basic_ptree<K, D, C>::const_iterator
basic_ptree<K, D, C>::to_iterator(const_assoc_iterator ai) const
{
- return const_iterator(subs::ch(this).project<0>(ai.base()));
+ return const_iterator(subs::ch(this).
+ BOOST_NESTED_TEMPLATE project<0>(ai.base()));
}
// Property tree view
@@ -746,7 +748,7 @@
Translator tr) const
{
if (optional<const self_type&> child = get_child_optional(path))
- return child.get().get_value_optional<Type>(tr);
+ return child.get().BOOST_NESTED_TEMPLATE get_value_optional<Type>(tr);
else
return optional<Type>();
}