Changeset: dc593b1dcb39 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dc593b1dcb39
Modified Files:
gdk/gdk.h
gdk/gdk_rtree.c
Branch: geo-update-dev
Log Message:
Removed RTREEdestroy and RTREEfree from the HAVE_RTREE guard, made them no-ops
in the case of not having the RTRee
diffs (37 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1885,12 +1885,13 @@ gdk_export bool RTREEexists(BAT *b);
gdk_export bool RTREEexists_bid(bat *bid);
gdk_export gdk_return BATrtree(BAT *wkb, BAT* mbr);
gdk_export BUN* RTREEsearch(BAT *b, mbr_t *inMBR, int result_limit);
-gdk_export void RTREEdestroy(BAT *b);
-gdk_export void RTREEfree(BAT *b);
gdk_export void RTREEdecref(BAT *b);
gdk_export void RTREEincref(BAT *b);
#endif
+gdk_export void RTREEdestroy(BAT *b);
+gdk_export void RTREEfree(BAT *b);
+
/* The ordered index structure */
gdk_export gdk_return BATorderidx(BAT *b, bool stable);
diff --git a/gdk/gdk_rtree.c b/gdk/gdk_rtree.c
--- a/gdk/gdk_rtree.c
+++ b/gdk/gdk_rtree.c
@@ -348,4 +348,14 @@ RTREEsearch(BAT *b, mbr_t *inMBR, int re
} else
return NULL;
}
+#else
+void
+RTREEdestroy(BAT *b) {
+ (void) b;
+}
+
+void
+RTREEfree(BAT *b) {
+ (void) b;
+}
#endif
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
