Changeset: b6e9b926536e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b6e9b926536e
Modified Files:
sql/storage/objectset.c
Branch: geo-update-dev
Log Message:
Renamed function to not overlap with librtree API
diffs (43 lines):
diff --git a/sql/storage/objectset.c b/sql/storage/objectset.c
--- a/sql/storage/objectset.c
+++ b/sql/storage/objectset.c
@@ -163,7 +163,7 @@ hash_delete(sql_hash *h, void *data)
}
static void
-node_destroy(objectset *os, sqlstore *store, versionhead *n)
+node_destroy_(objectset *os, sqlstore *store, versionhead *n)
{
if (!os->sa)
_DELETE(n);
@@ -392,11 +392,11 @@ objectversion_destroy(sqlstore *store, o
bte state = os_atmc_get_state(ov);
if (state & name_based_versionhead_owner) {
- node_destroy(ov->os, store, ov->name_based_head);
+ node_destroy_(ov->os, store, ov->name_based_head);
}
if (state & id_based_versionhead_owner) {
- node_destroy(ov->os, store, ov->id_based_head);
+ node_destroy_(ov->os, store, ov->id_based_head);
}
if (os->destroy)
@@ -666,14 +666,14 @@ os_destroy(objectset *os, sql_store stor
ov = older;
}
versionhead* hn =n->next;
- node_destroy(os, store, n);
+ node_destroy_(os, store, n);
n = hn;
}
n=os->name_based_h;
while(n) {
versionhead* hn =n->next;
- node_destroy(os, store, n);
+ node_destroy_(os, store, n);
n = hn;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
