From c22fd9f4fd6699333629b8acb1e9c135a9783082 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 4 Mar 2019 23:20:29 +0100 Subject: Dive sites: prepare for dive site ref-counting Add a dive site table to each dive site to keep track of dives that have been added to a dive site. Add two functions to add dives to / remove dives from dive sites. Since dive sites now contain a dive table, the order of includes had to be changed: "divesite.h" now includes "dive.h" and not vice-versa. This caused some include churn. Signed-off-by: Berthold Stoeger --- tests/testmerge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/testmerge.cpp') diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp index c8a103c82..739e7014d 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "testmerge.h" -#include "core/dive.h" +#include "core/divesite.h" #include "core/divelist.h" #include "core/file.h" #include -- cgit v1.2.3-70-g09d2