• R/O
  • SSH
  • HTTPS

eirrepo: Commit


Commit MetaInfo

Revision154 (tree)
Time2018-11-25 20:44:24
Authorquiret

Log Message

- various bugfixes

Change Summary

Incremental Difference

--- common/sdk/Map.h (revision 153)
+++ common/sdk/Map.h (revision 154)
@@ -336,7 +336,7 @@
336336 {
337337 size_t count = 0;
338338
339- MapAVLTree::diff_node_iterator iter( this->data.avlKeyTree );
339+ typename MapAVLTree::diff_node_iterator iter( this->data.avlKeyTree );
340340
341341 while ( !iter.IsEnd() )
342342 {
@@ -362,7 +362,7 @@
362362 {
363363 if ( const AVLNode *avlExistingNode = this->data.avlKeyTree.FindNode( key ) )
364364 {
365- return AVL_GETITEM( const Node, avlExistingNode, sortedByKeyNode );
365+ return AVL_GETITEM( constNode, avlExistingNode, sortedByKeyNode );
366366 }
367367
368368 return nullptr;
@@ -375,7 +375,9 @@
375375 }
376376
377377 MAKE_SETMAP_ITERATOR( iterator, Map, Node, sortedByKeyNode, data.avlKeyTree, MapAVLTree );
378- MAKE_SETMAP_ITERATOR( const_iterator, const Map, Node, sortedByKeyNode, data.avlKeyTree, MapAVLTree );
378+ typedef const Node constNode;
379+ typedef const Map constMap;
380+ MAKE_SETMAP_ITERATOR( const_iterator, constMap, constNode, sortedByKeyNode, data.avlKeyTree, MapAVLTree );
379381
380382 // Walks through all nodes of this tree.
381383 template <typename callbackType>
--- common/sdk/Set.h (revision 153)
+++ common/sdk/Set.h (revision 154)
@@ -331,7 +331,7 @@
331331 {
332332 size_t count = 0;
333333
334- SetAVLTree::diff_node_iterator iter( this->data.avlValueTree );
334+ typename SetAVLTree::diff_node_iterator iter( this->data.avlValueTree );
335335
336336 while ( !iter.IsEnd() )
337337 {
@@ -357,7 +357,7 @@
357357 {
358358 if ( const AVLNode *avlExistingNode = this->data.avlValueTree.FindNode( value ) )
359359 {
360- return AVL_GETITEM( const Node, avlExistingNode, sortedByValueNode );
360+ return AVL_GETITEM( constNode, avlExistingNode, sortedByValueNode );
361361 }
362362
363363 return nullptr;
@@ -372,7 +372,8 @@
372372 // Public iterator.
373373 MAKE_SETMAP_ITERATOR( iterator, Set, Node, sortedByValueNode, data.avlValueTree, SetAVLTree );
374374 typedef const Node constNode;
375- MAKE_SETMAP_ITERATOR( const_iterator, Set, constNode, sortedByValueNode, data.avlValueTree, SetAVLTree );
375+ typedef const Set constSet;
376+ MAKE_SETMAP_ITERATOR( const_iterator, constSet, constNode, sortedByValueNode, data.avlValueTree, SetAVLTree );
376377
377378 // Walks through all nodes of this tree.
378379 template <typename callbackType>
Show on old repository browser