[Boost-commit] svn:boost r46299 - sandbox/SOC/2008/digital_searching/dsearch/boost/dsearch

From: chintanraoh_at_[hidden]
Date: 2008-06-10 13:00:25

Author: chintanraoh
Date: 2008-06-10 13:00:25 EDT (Tue, 10 Jun 2008)
New Revision: 46299
URL: http://svn.boost.org/trac/boost/changeset/46299

Log:
added size ()
Text files modified: 
   sandbox/SOC/2008/digital_searching/dsearch/boost/dsearch/trie_iterator.hpp |    27 ++++++++++++++++-----------             
   1 files changed, 16 insertions(+), 11 deletions(-)

Modified: sandbox/SOC/2008/digital_searching/dsearch/boost/dsearch/trie_iterator.hpp
==============================================================================
--- sandbox/SOC/2008/digital_searching/dsearch/boost/dsearch/trie_iterator.hpp	(original)
+++ sandbox/SOC/2008/digital_searching/dsearch/boost/dsearch/trie_iterator.hpp	2008-06-10 13:00:25 EDT (Tue, 10 Jun 2008)
@@ -27,31 +27,36 @@
         typedef trie_iterator<Key,Mapped,Cursor> self;
 
         std::vector<Cursor> cur_st;
-	int size;
+	int cur_size;
         bool end_flag;
 
         void push ( const Cursor &c )
         {
-		++size;
+		++cur_size;
                 cur_st.push_back(c);
         }
         
         void pop()
         {
-		--size;
+		--cur_size;
                 cur_st.pop_back();
         }
 
         Cursor &top() 
         {
                 assert(!(this->empty()));
-		return cur_st[size-1];
+		return cur_st[cur_size-1];
+	}
+	
+	std::size_t size()
+	{
+		return cur_size;
         }
 
         Cursor get_top() const
         {
                 assert(!(this->empty()));
-		return cur_st[size-1];
+		return cur_st[cur_size-1];
         }
 
         bool empty() const
@@ -166,15 +171,15 @@
 
         Mapped &dereference() const
         {
-		assert ( (cur_st[size-1]).has_value() );
-		return ( (cur_st[size-1]).get_value() );
+		assert ( (cur_st[cur_size-1]).has_value() );
+		return ( (cur_st[cur_size-1]).get_value() );
         }
         
         bool equal( const self &other ) const
         {
                 assert(!this->empty());
                 if(end_flag!=other.end_flag) return false;
-		if(other.cur_st[other.size-1]==cur_st[size-1])
+		if(other.cur_st[other.cur_size-1]==cur_st[cur_size-1])
                         return true;
                 return false;
         }
@@ -182,12 +187,12 @@
         public:
         trie_iterator():end_flag(false) //to be pushed later.. thats why
         {
-		size=0;
+		cur_size=0;
         }
 
         trie_iterator( Cursor const &cursor_root,bool end_flag=false ) //returns begin cursor
         {
-		size=0;
+		cur_size=0;
                 this->end_flag=end_flag;
                 if(this->end_flag)
                 {
@@ -215,7 +220,7 @@
                      )
         {
                 end_flag=other.end_flag;
-		size=0;
+		cur_size=0;
 
                 typename std::vector<C>::const_iterator it=other.cur_st.begin();
                 while ( it!=other.cur_st.end() )