From c313846421958932cac80263bb361ba859601cc2 Mon Sep 17 00:00:00 2001
From: Martin Gerhardy <martin.gerhardy@gmail.com>
Date: Fri, 8 Nov 2024 17:35:30 +0100
Subject: [PATCH] VOXELUTIL: added nodiscard

---
 src/modules/voxelutil/VolumeMerger.h | 4 ++--
 src/modules/voxelutil/VolumeMover.h  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/voxelutil/VolumeMerger.h b/src/modules/voxelutil/VolumeMerger.h
index 78697293f9..d4dec8993a 100644
--- a/src/modules/voxelutil/VolumeMerger.h
+++ b/src/modules/voxelutil/VolumeMerger.h
@@ -118,7 +118,7 @@ inline int mergeRawVolumesSameDimension(voxel::RawVolume* destination, const vox
 	return mergeVolumes(destination, source, destination->region(), source->region());
 }
 
-extern voxel::RawVolume* merge(const core::DynamicArray<voxel::RawVolume*>& volumes);
-extern voxel::RawVolume* merge(const core::DynamicArray<const voxel::RawVolume*>& volumes);
+[[nodiscard]] voxel::RawVolume* merge(const core::DynamicArray<voxel::RawVolume*>& volumes);
+[[nodiscard]] voxel::RawVolume* merge(const core::DynamicArray<const voxel::RawVolume*>& volumes);
 
 }
diff --git a/src/modules/voxelutil/VolumeMover.h b/src/modules/voxelutil/VolumeMover.h
index b0c686c88e..d364f7f8cc 100644
--- a/src/modules/voxelutil/VolumeMover.h
+++ b/src/modules/voxelutil/VolumeMover.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "voxel/RawVolume.h"
-#include "core/Common.h"
+#include "voxel/Voxel.h"
+#include "voxel/Region.h"
 #include "core/Trace.h"
 
 namespace voxelutil {