From dca1ebbbfb4cc871fc9de3c5c04cb5c7db130b38 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@pobox.com>
Date: Thu, 9 Nov 2017 16:50:38 -0800
Subject: [PATCH] Get rid of some C99-style variable-length arrays

---
 geobuf.cpp  | 7 +++++--
 geojson.cpp | 9 +++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/geobuf.cpp b/geobuf.cpp
index a3e965f0..ac83e74d 100644
--- a/geobuf.cpp
+++ b/geobuf.cpp
@@ -443,8 +443,11 @@ void runQueue() {
 		return;
 	}
 
-	struct queue_run_arg qra[CPUS];
-	pthread_t pthreads[CPUS];
+	std::vector<struct queue_run_arg> qra;
+	qra.resize(CPUS);
+
+	std::vector<pthread_t> pthreads;
+	pthreads.resize(CPUS);
 
 	for (size_t i = 0; i < CPUS; i++) {
 		*((*(feature_queue[0].sst))[i].layer_seq) = *((*(feature_queue[0].sst))[0].layer_seq) + feature_queue.size() * i / CPUS;
diff --git a/geojson.cpp b/geojson.cpp
index 9ede8390..b2bd8297 100644
--- a/geojson.cpp
+++ b/geojson.cpp
@@ -146,10 +146,15 @@ int serialize_geojson_feature(struct serialization_state *sst, json_object *geom
 		nprop = properties->length;
 	}
 
-	char *metakey[nprop];
+	std::vector<char *> metakey;
+	metakey.resize(nprop);
+
 	std::vector<std::string> metaval;
 	metaval.resize(nprop);
-	int metatype[nprop];
+
+	std::vector<int> metatype;
+	metatype.resize(nprop);
+
 	size_t m = 0;
 
 	for (size_t i = 0; i < nprop; i++) {