From ff6bd7b82d3ee40ba4e44e79eb6ed6ec6fd6c84d Mon Sep 17 00:00:00 2001
From: Marc Gilleron <marc.gilleron@gmail.com>
Date: Sat, 5 Feb 2022 17:32:36 +0000
Subject: [PATCH] Fix GCC initializer list reorder warnings

---
 server/load_block_data_request.cpp |  8 ++++----
 server/save_block_data_request.cpp | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/load_block_data_request.cpp b/server/load_block_data_request.cpp
index 90bada43..f7238046 100644
--- a/server/load_block_data_request.cpp
+++ b/server/load_block_data_request.cpp
@@ -14,14 +14,14 @@ std::atomic_int g_debug_load_block_tasks_count;
 LoadBlockDataRequest::LoadBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod,
 		uint8_t p_block_size, bool p_request_instances, std::shared_ptr<StreamingDependency> p_stream_dependency,
 		PriorityDependency p_priority_dependency) :
-		_volume_id(p_volume_id),
+		_priority_dependency(p_priority_dependency),
 		_position(p_block_pos),
+		_volume_id(p_volume_id),
 		_lod(p_lod),
 		_block_size(p_block_size),
-		_request_voxels(true),
 		_request_instances(p_request_instances),
-		_stream_dependency(p_stream_dependency),
-		_priority_dependency(p_priority_dependency) {
+		_request_voxels(true),
+		_stream_dependency(p_stream_dependency) {
 	//
 	++g_debug_load_block_tasks_count;
 }
diff --git a/server/save_block_data_request.cpp b/server/save_block_data_request.cpp
index c354a258..790b1d2a 100644
--- a/server/save_block_data_request.cpp
+++ b/server/save_block_data_request.cpp
@@ -14,14 +14,14 @@ std::atomic_int g_debug_save_block_tasks_count;
 SaveBlockDataRequest::SaveBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod,
 		uint8_t p_block_size, std::shared_ptr<VoxelBufferInternal> p_voxels,
 		std::shared_ptr<StreamingDependency> p_stream_dependency) :
-		_volume_id(p_volume_id),
+		_voxels(p_voxels),
 		_position(p_block_pos),
+		_volume_id(p_volume_id),
 		_lod(p_lod),
 		_block_size(p_block_size),
-		_save_voxels(true),
 		_save_instances(false),
-		_stream_dependency(p_stream_dependency),
-		_voxels(p_voxels) {
+		_save_voxels(true),
+		_stream_dependency(p_stream_dependency) {
 	//
 	++g_debug_save_block_tasks_count;
 }
@@ -29,14 +29,14 @@ SaveBlockDataRequest::SaveBlockDataRequest(uint32_t p_volume_id, Vector3i p_bloc
 SaveBlockDataRequest::SaveBlockDataRequest(uint32_t p_volume_id, Vector3i p_block_pos, uint8_t p_lod,
 		uint8_t p_block_size, std::unique_ptr<InstanceBlockData> p_instances,
 		std::shared_ptr<StreamingDependency> p_stream_dependency) :
-		_volume_id(p_volume_id),
+		_instances(std::move(p_instances)),
 		_position(p_block_pos),
+		_volume_id(p_volume_id),
 		_lod(p_lod),
 		_block_size(p_block_size),
-		_save_voxels(false),
 		_save_instances(true),
-		_stream_dependency(p_stream_dependency),
-		_instances(std::move(p_instances)) {
+		_save_voxels(false),
+		_stream_dependency(p_stream_dependency) {
 	//
 	++g_debug_save_block_tasks_count;
 }