VOXELUTIL: added nodiscard

vengi-voxel · Nov 8, 2024 · c313846 · c313846
1 parent c1b4d6a
commit c313846
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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 {