From a7bbb6c1cc5c5b9ed3dc48cdb4da910214d51e96 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 17 Oct 2020 09:58:23 +0200 Subject: filter: remove filter_preset_table_t We used a typedef "filter_preset_table_t" for the filter preset table, because it is a "std::vector". However, that is in contrast to all the other global tables (dives, trips, sites) that we have. Therefore, turn this into a standard struct, which simply inherits from "std::vector". Note that while inheriting from std::vector<> is generally not recommended, it is not a problem here, because we don't modify it in any shape or form. Signed-off-by: Berthold Stoeger --- core/load-git.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/load-git.c') diff --git a/core/load-git.c b/core/load-git.c index 915db26e2..bcb311100 100644 --- a/core/load-git.c +++ b/core/load-git.c @@ -47,7 +47,7 @@ struct git_parser_state { struct dive_table *table; struct trip_table *trips; struct dive_site_table *sites; - filter_preset_table_t *filter_presets; + struct filter_preset_table *filter_presets; int o2pressure_sensor; }; @@ -1879,7 +1879,7 @@ const char *get_sha(git_repository *repo, const char *branch) * or report an error and return 1 if the load failed. */ int git_load_dives(struct git_repository *repo, const char *branch, struct dive_table *table, struct trip_table *trips, - struct dive_site_table *sites, filter_preset_table_t *filter_presets) + struct dive_site_table *sites, struct filter_preset_table *filter_presets) { int ret; struct git_parser_state state = { 0 }; -- cgit v1.2.3-70-g09d2