From d04bd09d117ec113d6ec22404f80f203f3273cf2 Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Wed, 27 Apr 2022 22:14:22 +0800 Subject: [PATCH] fix struct name collision [#12] --- flatgeobuf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flatgeobuf.cpp b/flatgeobuf.cpp index 8ea9185..45038bd 100644 --- a/flatgeobuf.cpp +++ b/flatgeobuf.cpp @@ -248,7 +248,7 @@ void readFeature(const FlatGeobuf::Feature *feature, long long feature_sequence_ serialize_feature(sst, sf); } -struct queued_feature { +struct fgb_queued_feature { const FlatGeobuf::Feature *feature = NULL; long long feature_sequence_id = -1; FlatGeobuf::GeometryType h_geometry_type = FlatGeobuf::GeometryType::Unknown; @@ -259,7 +259,7 @@ struct queued_feature { std::string layername = ""; }; -static std::vector feature_queue; +static std::vector feature_queue; struct queue_run_arg { size_t start; @@ -275,7 +275,7 @@ void *fgb_run_parse_feature(void *v) { struct queue_run_arg *qra = (struct queue_run_arg *) v; for (size_t i = qra->start; i < qra->end; i++) { - struct queued_feature &qf = feature_queue[i]; + struct fgb_queued_feature &qf = feature_queue[i]; readFeature(qf.feature, qf.feature_sequence_id, qf.h_geometry_type, *qf.h_column_names, *qf.h_column_types, &(*qf.sst)[qra->segment], qf.layer, qf.layername); } @@ -323,7 +323,7 @@ void fgbRunQueue() { } void queueFeature(const FlatGeobuf::Feature *feature, long long feature_sequence_id, FlatGeobuf::GeometryType h_geometry_type, const std::vector &h_column_names, const std::vector &h_column_types, std::vector *sst, int layer, std::string layername) { - struct queued_feature qf; + struct fgb_queued_feature qf; qf.feature = feature; qf.feature_sequence_id = feature_sequence_id; qf.h_geometry_type = h_geometry_type;