Commit d2785d14 authored by David Gobbi's avatar David Gobbi

Remove assignment operator from octree_iterator.

This is a follow-up to gerrit I3e5e8858d31f0711d49e0281adbfbd7c7b6e381e.
In that commit, I removed the assignment operator from octree_path
because it looked as though the only reason for a custom-defined
operator was to work around some const-related bugs in Visual Studio 6.
The octree_iterator class is a subclass of octree_path that had exactly
the same issues.

Change-Id: I15e7622e7c8bde139770e7bf6ff058360f0335fd
parent b3387f86
......@@ -260,30 +260,6 @@ void octree_iterator<T_,R_,P_,O_,OP_,d_>::immediate_family( bool val )
*\brief Return whether the iterator is set to traverse the entire tree or just the siblings of the current node.
*/
/**\brief Assignment operator (for copying iterators of mutable nodes).
*
*/
template< typename T_, typename R_, typename P_, typename O_, typename OP_, int d_ >
octree_iterator< T_, R_, P_, O_, OP_, d_ >& octree_iterator<T_,R_,P_,O_,OP_,d_>::operator = ( const iterator& it )
{
this->octree_path<T_,R_,P_,O_,OP_,d_>::operator=( it );
this->_M_immediate_family = it._M_immediate_family;
this->_M_only_leaf_nodes = it._M_only_leaf_nodes;
return *this;
}
/**\brief Assignment operator (for copying iterators of immutable nodes).
*
*/
template< typename T_, typename R_, typename P_, typename O_, typename OP_, int d_ >
octree_iterator< T_, R_, P_, O_, OP_, d_ >& octree_iterator<T_,R_,P_,O_,OP_,d_>::operator = ( const const_iterator& it )
{
this->octree_path<T_,R_,P_,O_,OP_,d_>::operator=( it );
this->_M_immediate_family = it._M_immediate_family;
this->_M_only_leaf_nodes = it._M_only_leaf_nodes;
return *this;
}
/**\fn template< typename T_, typename R_, typename P_, typename O_, typename OP_, int d_ > \
* self_iterator& octree_iterator<T_,R_,P_,O_,OP_,d_>::operator ++ ()
*\brief Move to the next node in the octree that satisfies the traversal criteria.
......
......@@ -44,9 +44,6 @@ public:
bool immediate_family() const { return this->_M_immediate_family; }
bool& immediate_family() { return this->_M_immediate_family; }
self_iterator& operator = ( const iterator& it );
self_iterator& operator = ( const const_iterator& it );
self_iterator& operator ++ () { this->_M_current_node = check_incr(); return *this; }
self_iterator operator ++ ( int ) { self_iterator tmp = *this; this->_M_current_node = check_incr(); return tmp; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment