INTEGRATION: CWS adc18 (1.3.56); FILE MERGED

2007/10/18 15:23:12 np 1.3.56.1: #i81775#
This commit is contained in:
Jens-Heiner Rechtien
2007-11-02 15:02:01 +00:00
parent 300f9fce6f
commit ae3b43f8bb

View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: nametree.hxx,v $ * $RCSfile: nametree.hxx,v $
* *
* $Revision: 1.3 $ * $Revision: 1.4 $
* *
* last change: $Author: rt $ $Date: 2005-09-07 16:59:35 $ * last change: $Author: hr $ $Date: 2007-11-02 16:02:01 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -36,15 +36,12 @@
#ifndef ARY_NAMETREE_HXX #ifndef ARY_NAMETREE_HXX
#define ARY_NAMETREE_HXX #define ARY_NAMETREE_HXX
// USED SERVICES // USED SERVICES
// BASE CLASSES #include <ary/types.hxx>
// COMPONENTS #include <ary/namesort.hxx>
#include <ary/ids.hxx>
#include "instlist.hxx" #include "instlist.hxx"
#include "namesort.hxx"
// PARAMETERS
namespace ary namespace ary
@@ -54,17 +51,9 @@ namespace ary
class NameTree class NameTree
{ {
public: public:
#if 0 // Test new comparison typedef std::map< String ,
struct Less_Name
{
bool operator()(
const udmstri & i_r1,
const udmstri & i_r2 ) const;
};
#endif // 0
typedef std::map< udmstri,
InstanceList, InstanceList,
CompareCeNames > Map_Name2Inst; LesserName > Map_Name2Inst;
typedef Map_Name2Inst::const_iterator const_iterator; typedef Map_Name2Inst::const_iterator const_iterator;
typedef Map_Name2Inst::iterator iterator; typedef Map_Name2Inst::iterator iterator;
@@ -75,16 +64,16 @@ class NameTree
const InstanceList & const InstanceList &
operator[]( operator[](
const udmstri & i_rName ) const; const String & i_rName ) const;
void insert( void insert(
const udmstri & i_rName, const String & i_rName,
ary::Rid i_nId ); ary::Rid i_nId );
const_iterator find( const_iterator find(
const udmstri & i_rName ); const String & i_rName );
const_iterator lower_bound( const_iterator lower_bound(
const udmstri & i_rName ) const; const String & i_rName ) const;
const_iterator begin() const; const_iterator begin() const;
const_iterator end() const; const_iterator end() const;
@@ -98,11 +87,6 @@ class NameTree
// IMPLEMENTATION
} // namespace ary } // namespace ary
#endif #endif