From f1cc1321e864bd6f1f7b42394c231757abf8acbe Mon Sep 17 00:00:00 2001 From: mat007 Date: Sun, 22 Jul 2012 07:07:04 +0000 Subject: [PATCH] Cleanup git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@497 860be788-9bd5-4423-9f1e-828f051e677b --- turtle/detail/root.hpp | 6 ++---- turtle/sequence.hpp | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/turtle/detail/root.hpp b/turtle/detail/root.hpp index 519e437..8173a01 100644 --- a/turtle/detail/root.hpp +++ b/turtle/detail/root.hpp @@ -30,7 +30,7 @@ namespace detail boost::optional< type_name > type, boost::unit_test::const_string name ) { - children_it it = children_.lower_bound( &v ); + children_t::iterator it = children_.lower_bound( &v ); if( it == children_.end() || children_.key_comp()( &v, it->first ) ) it = children_.insert( it, @@ -69,7 +69,6 @@ namespace detail private: typedef std::map< const void*, std::pair< parent, std::size_t > > parents_t; - typedef parents_t::iterator parents_it; class counter_child { @@ -109,13 +108,12 @@ namespace detail counter_child& operator=( const counter_child& ); parents_t* parents_; - parents_it it_; + parents_t::iterator it_; child child_; }; typedef std::map< const verifiable*, counter_child > children_t; typedef children_t::const_iterator children_cit; - typedef children_t::iterator children_it; parents_t parents_; children_t children_; diff --git a/turtle/sequence.hpp b/turtle/sequence.hpp index 0a4d68b..4d4e86d 100644 --- a/turtle/sequence.hpp +++ b/turtle/sequence.hpp @@ -39,7 +39,7 @@ namespace detail void invalidate( const void* e ) { - elements_it it = + elements_type::iterator it = std::find( elements_.begin(), elements_.end(), e ); if( it != elements_.end() ) elements_.erase( elements_.begin(), it ); @@ -47,7 +47,6 @@ namespace detail private: typedef std::vector< void* > elements_type; - typedef elements_type::iterator elements_it; elements_type elements_; };