aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorOystein Eftevaag2009-06-13 13:27:21 +0000
committerOystein Eftevaag2009-06-13 13:27:21 +0000
commitcca9202372e5b8b9f6b5350488da26e4bd3ab8bc (patch)
treeb49246c082d112888a88cac30bbfeb5ee2badec2 /engines/sci
parentabd23cf3ca8c9f8592121c20a1022b144841585a (diff)
downloadscummvm-rg350-cca9202372e5b8b9f6b5350488da26e4bd3ab8bc.tar.gz
scummvm-rg350-cca9202372e5b8b9f6b5350488da26e4bd3ab8bc.tar.bz2
scummvm-rg350-cca9202372e5b8b9f6b5350488da26e4bd3ab8bc.zip
Buildfix for gcc 3.3 (moved a template class member into the header file)
svn-id: r41493
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/memobj.cpp7
-rw-r--r--engines/sci/engine/memobj.h6
2 files changed, 5 insertions, 8 deletions
diff --git a/engines/sci/engine/memobj.cpp b/engines/sci/engine/memobj.cpp
index c0775ae51e..4d37d2aece 100644
--- a/engines/sci/engine/memobj.cpp
+++ b/engines/sci/engine/memobj.cpp
@@ -269,13 +269,6 @@ void Script::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param,
//-------------------- clones --------------------
-template<typename T>
-void Table<T>::listAllDeallocatable(SegmentId segId, void *param, NoteCallback note) {
- for (uint i = 0; i < _table.size(); i++)
- if (isValidEntry(i))
- (*note)(param, make_reg(segId, i));
-}
-
void CloneTable::listAllOutgoingReferences(EngineState *s, reg_t addr, void *param, NoteCallback note) {
CloneTable *clone_table = this;
Clone *clone;
diff --git a/engines/sci/engine/memobj.h b/engines/sci/engine/memobj.h
index f800695df5..50c43a0e88 100644
--- a/engines/sci/engine/memobj.h
+++ b/engines/sci/engine/memobj.h
@@ -502,7 +502,11 @@ public:
entries_used--;
}
- virtual void listAllDeallocatable(SegmentId segId, void *param, NoteCallback note);
+ virtual void listAllDeallocatable(SegmentId segId, void *param, NoteCallback note) {
+ for (uint i = 0; i < _table.size(); i++)
+ if (isValidEntry(i))
+ (*note)(param, make_reg(segId, i));
+ }
};