curve: Fix gcc compiler warnings.

SFTtech · Jan 16, 2025 · e61ec89 · e61ec89
1 parent e7f656f
commit e61ec89
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/libopenage/curve/array.h b/libopenage/curve/array.h
@@ -197,11 +197,6 @@ class Array : event::EventEntity {
 		}
 
 	private:
-		/**
-		 * used to index the Curve::Array pointed to by this iterator
-		 */
-		size_t offset;
-
 		/**
 		 * the curve object that this iterator, iterates over
 		 */
@@ -211,6 +206,11 @@ class Array : event::EventEntity {
 		 * time at which this iterator is iterating over
 		 */
 		time::time_t time;
+
+		/**
+		 * used to index the Curve::Array pointed to by this iterator
+		 */
+		size_t offset;
 	};
 
 	/**
@@ -335,7 +335,7 @@ void Array<T, Size>::set_replace(const time::time_t &t,
 template <typename T, size_t Size>
 void Array<T, Size>::sync(const Array<T, Size> &other,
                           const time::time_t &start) {
-	for (int i = 0; i < Size; i++) {
+	for (index_t i = 0; i < Size; i++) {
 		this->containers[i].sync(other.containers[i], start);
 	}
 

diff --git a/libopenage/curve/tests/container.cpp b/libopenage/curve/tests/container.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017-2024 the openage authors. See copying.md for legal info.
+// Copyright 2017-2025 the openage authors. See copying.md for legal info.
 
 #include <algorithm>
 #include <deque>
@@ -247,7 +247,7 @@ void test_array() {
 	auto f = std::make_shared<event::EventLoop>();
 
 	Array<int, 4> a(f, 0);
-	const std::array<int, 4> &default_val = std::array<int, 4>();
+	// const std::array<int, 4> &default_val = std::array<int, 4>();
 	a.set_insert(1, 0, 0);
 	a.set_insert(1, 1, 1);
 	a.set_insert(1, 2, 2);