Merge pull request #2395 from mavlink/pr-v2.12-newer-compiler-fixes

[v2.12] Fix includes and warnings with GCC14 and clang18
mavlink · Sep 9, 2024 · de7c9c8 · de7c9c8
2 parents 71126ac + 0176507
commit de7c9c8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 1 deletion.
diff --git a/examples/logfile_download/logfile_download.cpp b/examples/logfile_download/logfile_download.cpp
@@ -10,6 +10,7 @@
 #include <future>
 #include <iostream>
 #include <iomanip>
+#include <string>
 #include <cstring>
 #include <thread>
 
@@ -42,7 +43,7 @@ int main(int argc, char** argv)
     bool remove_log_files = false;
 
     for (int i = 2; i < argc; ++i) {
-        if (argv[i] == "--rm") {
+        if (std::string(argv[i]) == "--rm") {
             remove_log_files = true;
         }
     }

diff --git a/src/mavsdk/core/call_every_handler.cpp b/src/mavsdk/core/call_every_handler.cpp
@@ -1,5 +1,6 @@
 #include "call_every_handler.h"
 
+#include <algorithm>
 #include <utility>
 
 namespace mavsdk {

diff --git a/src/mavsdk/core/callback_list_impl.h b/src/mavsdk/core/callback_list_impl.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <algorithm>
 #include <cstdint>
 #include <functional>
 #include <atomic>

diff --git a/src/mavsdk/core/mavlink_request_message_handler.cpp b/src/mavsdk/core/mavlink_request_message_handler.cpp
@@ -3,6 +3,7 @@
 #include "server_component_impl.h"
 #include "mavlink_command_receiver.h"
 #include "log.h"
+#include <algorithm>
 
 namespace mavsdk {
 

diff --git a/src/mavsdk/core/timeout_handler.cpp b/src/mavsdk/core/timeout_handler.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include "timeout_handler.h"
 
 namespace mavsdk {

diff --git a/src/mavsdk/plugins/telemetry_server/telemetry_server_impl.cpp b/src/mavsdk/plugins/telemetry_server/telemetry_server_impl.cpp
@@ -1,5 +1,6 @@
 #include "telemetry_server_impl.h"
 #include "unused.h"
+#include <algorithm>
 #include <array>
 
 namespace mavsdk {