r172 - libtagcoll/trunk/src

[Enrico Zini]

Author: enrico
Date: Wed Jul 21 17:23:23 2004
New Revision: 172

Modified:
libtagcoll/trunk/src/OpSet.h
libtagcoll/trunk/src/SmartHierarchy.h
Log:
Now it compiles with g++ 3.4


Modified: libtagcoll/trunk/src/OpSet.h
==============================================================================
--- libtagcoll/trunk/src/OpSet.h (original)
+++ libtagcoll/trunk/src/OpSet.h Wed Jul 21 17:23:23 2004
@@ -37,6 +37,9 @@
class OpSet : public std::set<T>
{
public:
+ using std::set<T>::begin;
+ using std::set<T>::end;
+
// Return true if the tag set contains tag, else false
bool contains(const T& item) const throw () { return find(item) != end(); }


Modified: libtagcoll/trunk/src/SmartHierarchy.h
==============================================================================
--- libtagcoll/trunk/src/SmartHierarchy.h (original)
+++ libtagcoll/trunk/src/SmartHierarchy.h Wed Jul 21 17:23:23 2004
@@ -106,6 +106,10 @@
class SmartHierarchyNode : public HierarchyNode<ITEM, TAG>
{
protected:
+ using HierarchyNode<ITEM, TAG>::coll;
+ using HierarchyNode<ITEM, TAG>::items;
+ using HierarchyNode<ITEM, TAG>::children;
+
// Threshold of child items below which the child hierarchy is flattened
// and they all become children of this node
int flattenThreshold;
@@ -126,6 +130,13 @@
class CleanSmartHierarchyNode : public SmartHierarchyNode<ITEM, TAG>
{
protected:
+ using HierarchyNode<ITEM, TAG>::coll;
+ using HierarchyNode<ITEM, TAG>::items;
+ using HierarchyNode<ITEM, TAG>::children;
+ using SmartHierarchyNode<ITEM, TAG>::_tag;
+ using SmartHierarchyNode<ITEM, TAG>::_parent;
+ using SmartHierarchyNode<ITEM, TAG>::flattenThreshold;
+
// Expand the collection in the children of this node
virtual void expand() throw ();