aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2005-03-18 04:56:27 +0000
committerThomas Grill <xovo@users.sourceforge.net>2005-03-18 04:56:27 +0000
commit580674d6bca1ad72d351cbe81af9e4f43af46a53 (patch)
tree08798436058b386130ad67fb29bb3cabe3121c9f
parent428806256328220836f6833c7b0fea5bc7157eac (diff)
fix for gcc
small update of linkage styles etc. svn path=/trunk/; revision=2632
-rw-r--r--externals/grill/flext/source/flmap.h4
-rw-r--r--externals/grill/flext/source/flsupport.cpp2
-rw-r--r--externals/grill/flext/source/flsupport.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/externals/grill/flext/source/flmap.h b/externals/grill/flext/source/flmap.h
index 7355a7ff..814f22ba 100644
--- a/externals/grill/flext/source/flmap.h
+++ b/externals/grill/flext/source/flmap.h
@@ -99,7 +99,7 @@ protected:
, n(0),parent(p),left(NULL),right(NULL)
{}
- virtual ~TableAnyMap() { clear(); }
+ virtual ~TableAnyMap();
int size() const;
@@ -183,7 +183,7 @@ protected:
template <typename K,typename T,int N = 8,bool O = false>
-class FLEXT_SHARE TableMap
+class TableMap
: TableAnyMap
{
public:
diff --git a/externals/grill/flext/source/flsupport.cpp b/externals/grill/flext/source/flsupport.cpp
index 1a55bdc5..004e8627 100644
--- a/externals/grill/flext/source/flsupport.cpp
+++ b/externals/grill/flext/source/flsupport.cpp
@@ -304,6 +304,8 @@ AnyMap::iterator AnyMap::find(AnyMapType k) { return Parent::find(k); }
AnyMapType &AnyMap::operator [](AnyMapType k) { return Parent::operator [](k); }
#endif
+TableAnyMap::~TableAnyMap() { clear(); }
+
void TableAnyMap::clear()
{
if(left) { delete left; left = NULL; }
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index 2491c035..9c5a7a41 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -636,7 +636,7 @@ public:
};
template<int PRE>
- class FLEXT_SHARE AtomListStatic
+ class AtomListStatic
: public AtomListStaticBase
{
public: