[Ipstream-devel] IPSocket/lib/helpers/enum enum.h,1.3,1.4
Status: Beta
Brought to you by:
kontramot
|
From: Sergey V. B. <kon...@us...> - 2010-03-17 07:29:17
|
Update of /cvsroot/ipstream/IPSocket/lib/helpers/enum In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1088/lib/helpers/enum Modified Files: enum.h Log Message: enum.h improved Index: enum.h =================================================================== RCS file: /cvsroot/ipstream/IPSocket/lib/helpers/enum/enum.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** enum.h 17 Mar 2010 06:40:40 -0000 1.3 --- enum.h 17 Mar 2010 07:29:08 -0000 1.4 *************** *** 30,34 **** * Template class of enumerator. * Its' imlementations were intended to be used as container for implementations ! * of IStringProcessor interface and ConfigRead function realization. */ template < typename Key, typename Value, --- 30,35 ---- * Template class of enumerator. * Its' imlementations were intended to be used as container for implementations ! * of IStringProcessor interface and ConfigRead function realization. ! * The idea was to simplify work with map and multimap containers. */ template < typename Key, typename Value, *************** *** 59,68 **** // Storage for enumeration typedef MapType < Key, Value, Traits, Allocator > mapEnum_t; - - mapEnum_t m_mapEnum; - typedef typename mapEnum_t::const_iterator citMapEnum_t; typedef typename mapEnum_t::iterator itMapEnum_t; // Storage for current position in storage. This member is needed for GetNextKey method. citMapEnum_t m_mapciEnum; --- 60,68 ---- // Storage for enumeration typedef MapType < Key, Value, Traits, Allocator > mapEnum_t; typedef typename mapEnum_t::const_iterator citMapEnum_t; typedef typename mapEnum_t::iterator itMapEnum_t; + mapEnum_t m_mapEnum; + // Storage for current position in storage. This member is needed for GetNextKey method. citMapEnum_t m_mapciEnum; *************** *** 196,203 **** // Storage for current position ! citMapEnum_t mapciEnum; // Check if key is present in container ! if ( ( mapciEnum = m_mapEnum.find( key ) ) != m_mapEnum.end() ) { return &( mapciEnum -> second ); --- 196,203 ---- // Storage for current position ! citMapEnum_t mapciEnum = m_mapEnum.find( key ); // Check if key is present in container ! if ( m_mapEnum.end() != mapciEnum ) { return &( mapciEnum -> second ); *************** *** 223,227 **** } ! if ( m_bIsInitialized && ( m_mapciEnum != m_mapEnum.end() ) ) { return &( m_mapciEnum -> second ); --- 223,227 ---- } ! if ( m_bIsInitialized && ( m_mapEnum.end() != m_mapciEnum ) ) { return &( m_mapciEnum -> second ); *************** *** 289,296 **** // Storage for position of found element ! itMapEnum_t mapiEnum; // Check if key is present in container ! if ( ( mapiEnum = m_mapEnum.find( key ) ) != m_mapEnum.end() ) { // Remove demanded element --- 289,296 ---- // Storage for position of found element ! itMapEnum_t mapiEnum = m_mapEnum.find( key ); // Check if key is present in container ! if ( m_mapEnum.end() != mapiEnum ) { // Remove demanded element |