Merge pull request #2179 from joto/fix-num-array-members

Fix number of array members

Author: lonvia

src/command-line-parser.cpp

@@ -27,11 +27,11 @@
 #endif
 
 #include <algorithm>
-#include <array>
 #include <cstdio>
 #include <cstring>
 #include <stdexcept>
 #include <thread> // for number of threads
+#include <vector>
 
 static osmium::Box parse_bbox_param(std::string const &arg)
 {
@@ -131,13 +131,10 @@ void print_version()
 
 static void check_options_non_slim(CLI::App const &app)
 {
-    std::array<std::string, 6> const slim_options = {
-        "--flat-nodes",
-        "--middle-schema",
-        "--middle-with-nodes",
-        "--middle-way-node-index-id-shift",
-        "--tablespace-slim-data",
-        "--tablespace-slim-index"};
+    std::vector<std::string> const slim_options = {
+        "--flat-nodes",           "--middle-schema",
+        "--middle-with-nodes",    "--middle-way-node-index-id-shift",
+        "--tablespace-slim-data", "--tablespace-slim-index"};
 
     for (auto const &opt : slim_options) {
         if (app.count(opt) > 0) {

src/flex-table-column.cpp

@@ -13,11 +13,11 @@
 #include "util.hpp"
 
 #include <algorithm>
-#include <array>
 #include <cctype>
 #include <cstdlib>
 #include <stdexcept>
 #include <utility>
+#include <vector>
 
 struct column_type_lookup
 {
@@ -27,7 +27,7 @@ struct column_type_lookup
     char const *name() const noexcept { return m_name; }
 };
 
-static std::array<column_type_lookup, 26> const column_types = {
+static std::vector<column_type_lookup> const column_types = {
     {{"text", table_column_type::text},
      {"boolean", table_column_type::boolean},
      {"bool", table_column_type::boolean},