Attachment #7186 for issue #11742

View | Details | Raw Unified | Return to issue 11742
Collapse All | Expand All




//*************************     SCI_Map      **********************************//

template <class KEY, class VALUE>
class SCI_Map : public StdConstIterator< typename std::map<KEY,VALUE>::value_type >
{
  public:
    typedef std::map<KEY,VALUE>     source;

  private:
    // Interface StdConstIterator<>:
    virtual void        do_Advance();
    virtual const typename std::map<KEY,VALUE>::value_type *
                        inq_CurElement() const;
    virtual bool        inq_IsSorted() const;


//*************************     SCI_MultiMap      **********************************//

template <class KEY, class VALUE>
class SCI_MultiMap : public StdConstIterator< typename std::multimap<KEY,VALUE>::value_type >
{
  public:
    typedef std::multimap<KEY,VALUE>    source;
    typedef typename source::const_iterator      source_iterator;

                        SCI_MultiMap(
                            const source &      i_rSource  );

  private:
    // Interface StdConstIterator<>:
    virtual void        do_Advance();
    virtual const typename std::multimap<KEY,VALUE>::value_type *
                        inq_CurElement() const;
    virtual bool        inq_IsSorted() const;


{
  public:
    typedef std::map<KEY,VALUE>     source;
    typedef typename source::const_iterator  source_iterator;

                        SCI_DataInMap(
                            const source &      i_rSource  );

}

template <class KEY, class VALUE>
const typename std::map<KEY,VALUE>::value_type *
SCI_Map<KEY,VALUE>::inq_CurElement() const
{
    if (itRun != itEnd)

}

template <class KEY, class VALUE>
const typename std::multimap<KEY,VALUE>::value_type *
SCI_MultiMap<KEY,VALUE>::inq_CurElement() const
{
    if (itRun != itEnd)

Lines 308-314 Link Here

(-)source/ary/inc/store/st_iterator.hxx (-1 / +1 lines)
308	{	308	{
309	public:	309	public:
310	RootFilterIterator(	310	RootFilterIterator(
311	const RootIterator<UNIT> &	311	const typename RootIterator<UNIT> &
312	i_rOther )	312	i_rOther )
313	: internal::IteratorBase< UNIT, FILTER >(	313	: internal::IteratorBase< UNIT, FILTER >(
314	i_rOther.CurBlock(),	314	i_rOther.CurBlock(),

Lines 112-116 Link Here

(-)source/display/toolkit/hf_funcdecl.cxx (-2 lines)
112	<< new Xml::XmlCode("( </p>\n");	112	<< new Xml::XmlCode("( </p>\n");
113	return *pNames;	113	return *pNames;
114	}	114	}
115
116

Lines 267-273 Link Here

(-)source/parser_i/inc/s2_luidl/pe_excp.hxx (-1 / +1 lines)
267		267
268	public: void store_Exception(); private:	268	public: void store_Exception(); private:
269		269
270	friend class PE_StructState;	270	// friend class PE_StructState;
271		271
272	S_Stati & Stati() { return *pStati; }	272	S_Stati & Stati() { return *pStati; }
273	S_Work & Work() { return aWork; }	273	S_Work & Work() { return aWork; }

Lines 266-272 Link Here

(-)source/parser_i/inc/s2_luidl/pe_struc.hxx (-1 / +1 lines)
266		266
267	public: void store_Struct(); private:	267	public: void store_Struct(); private:
268		268
269	friend class PE_StructState;	269	//friend class PE_StructState;
270		270
271	S_Stati & Stati() { return *pStati; }	271	S_Stati & Stati() { return *pStati; }
272	S_Work & Work() { return aWork; }	272	S_Work & Work() { return aWork; }

Return to issue 11742

Lines 105-111 Link Here

(-)source/ary/inc/sci_impl.hxx (-8 / +8 lines)
105	//*********************** SCI_Map ********************************//	105	//*********************** SCI_Map ********************************//
106		106
107	template <class KEY, class VALUE>	107	template <class KEY, class VALUE>
108	class SCI_Map : public StdConstIterator< std::map<KEY,VALUE>::value_type >	108	class SCI_Map : public StdConstIterator< typename std::map<KEY,VALUE>::value_type >
109	{	109	{
110	public:	110	public:
111	typedef std::map<KEY,VALUE> source;	111	typedef std::map<KEY,VALUE> source;
Lines 118-124 Link Here
118	private:	118	private:
119	// Interface StdConstIterator<>:	119	// Interface StdConstIterator<>:
120	virtual void do_Advance();	120	virtual void do_Advance();
121	virtual const std::map<KEY,VALUE>::value_type *	121	virtual const typename std::map<KEY,VALUE>::value_type *
122	inq_CurElement() const;	122	inq_CurElement() const;
123	virtual bool inq_IsSorted() const;	123	virtual bool inq_IsSorted() const;
124		124
Lines 131-141 Link Here
131	//*********************** SCI_MultiMap ********************************//	131	//*********************** SCI_MultiMap ********************************//
132		132
133	template <class KEY, class VALUE>	133	template <class KEY, class VALUE>
134	class SCI_MultiMap : public StdConstIterator< std::multimap<KEY,VALUE>::value_type >	134	class SCI_MultiMap : public StdConstIterator< typename std::multimap<KEY,VALUE>::value_type >
135	{	135	{
136	public:	136	public:
137	typedef std::multimap<KEY,VALUE> source;	137	typedef std::multimap<KEY,VALUE> source;
138	typedef source::const_iterator source_iterator;	138	typedef typename source::const_iterator source_iterator;
139		139
140	SCI_MultiMap(	140	SCI_MultiMap(
141	const source & i_rSource );	141	const source & i_rSource );
Lines 147-153 Link Here
147	private:	147	private:
148	// Interface StdConstIterator<>:	148	// Interface StdConstIterator<>:
149	virtual void do_Advance();	149	virtual void do_Advance();
150	virtual const std::multimap<KEY,VALUE>::value_type *	150	virtual const typename std::multimap<KEY,VALUE>::value_type *
151	inq_CurElement() const;	151	inq_CurElement() const;
152	virtual bool inq_IsSorted() const;	152	virtual bool inq_IsSorted() const;
153		153
Lines 193-199 Link Here
193	{	193	{
194	public:	194	public:
195	typedef std::map<KEY,VALUE> source;	195	typedef std::map<KEY,VALUE> source;
196	typedef source::const_iterator source_iterator;	196	typedef typename source::const_iterator source_iterator;
197		197
198	SCI_DataInMap(	198	SCI_DataInMap(
199	const source & i_rSource );	199	const source & i_rSource );
Lines 281-287 Link Here
281	}	281	}
282		282
283	template <class KEY, class VALUE>	283	template <class KEY, class VALUE>
284	const std::map<KEY,VALUE>::value_type *	284	const typename std::map<KEY,VALUE>::value_type *
285	SCI_Map<KEY,VALUE>::inq_CurElement() const	285	SCI_Map<KEY,VALUE>::inq_CurElement() const
286	{	286	{
287	if (itRun != itEnd)	287	if (itRun != itEnd)
Lines 332-338 Link Here
332	}	332	}
333		333
334	template <class KEY, class VALUE>	334	template <class KEY, class VALUE>
335	const std::multimap<KEY,VALUE>::value_type *	335	const typename std::multimap<KEY,VALUE>::value_type *
336	SCI_MultiMap<KEY,VALUE>::inq_CurElement() const	336	SCI_MultiMap<KEY,VALUE>::inq_CurElement() const
337	{	337	{
338	if (itRun != itEnd)	338	if (itRun != itEnd)