mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@497 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-07-22 07:07:04 +00:00
parent 0d0c450430
commit f1cc1321e8
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
turtle/detail/root.hpp
View file

@ -30,7 +30,7 @@ namespace detail
boost::optional< type_name > type, boost::optional< type_name > type,
boost::unit_test::const_string name ) 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() || if( it == children_.end() ||
children_.key_comp()( &v, it->first ) ) children_.key_comp()( &v, it->first ) )
it = children_.insert( it, it = children_.insert( it,
@ -69,7 +69,6 @@ namespace detail
private: private:
typedef std::map< const void*, typedef std::map< const void*,
std::pair< parent, std::size_t > > parents_t; std::pair< parent, std::size_t > > parents_t;
typedef parents_t::iterator parents_it;
class counter_child class counter_child
{ {
@ -109,13 +108,12 @@ namespace detail
counter_child& operator=( const counter_child& ); counter_child& operator=( const counter_child& );
parents_t* parents_; parents_t* parents_;
parents_it it_; parents_t::iterator it_;
child child_; child child_;
}; };
typedef std::map< const verifiable*, counter_child > children_t; typedef std::map< const verifiable*, counter_child > children_t;
typedef children_t::const_iterator children_cit; typedef children_t::const_iterator children_cit;
typedef children_t::iterator children_it;
parents_t parents_; parents_t parents_;
children_t children_; children_t children_;

3
turtle/sequence.hpp
View file

@ -39,7 +39,7 @@ namespace detail
void invalidate( const void* e ) void invalidate( const void* e )
{ {
elements_it it = elements_type::iterator it =
std::find( elements_.begin(), elements_.end(), e ); std::find( elements_.begin(), elements_.end(), e );
if( it != elements_.end() ) if( it != elements_.end() )
elements_.erase( elements_.begin(), it ); elements_.erase( elements_.begin(), it );
@ -47,7 +47,6 @@ namespace detail
private: private:
typedef std::vector< void* > elements_type; typedef std::vector< void* > elements_type;
typedef elements_type::iterator elements_it;
elements_type elements_; elements_type elements_;
}; };