From c0b464e9e201ff48b419c02671143da255a20f11 Mon Sep 17 00:00:00 2001 From: Daniel Agar <daniel@agar.ca> Date: Sun, 6 Jan 2019 11:34:39 -0500 Subject: [PATCH] replace <cinttypes> with <inttypes.h> - <cinttypes> isn't available in the NuttX c++ library --- msg/templates/uorb/msg.cpp.template | 2 +- msg/templates/uorb_microcdr/microRTPS_client.cpp.template | 2 +- src/lib/cdev/nuttx/cdev_platform.hpp | 2 +- src/lib/cdev/posix/cdev_platform.hpp | 2 +- .../micrortps_bridge/micrortps_client/microRTPS_client.h | 2 +- .../micrortps_bridge/micrortps_client/microRTPS_client_main.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/msg/templates/uorb/msg.cpp.template b/msg/templates/uorb/msg.cpp.template index 794da0da1d..8b0dfb7d6a 100644 --- a/msg/templates/uorb/msg.cpp.template +++ b/msg/templates/uorb/msg.cpp.template @@ -65,7 +65,7 @@ struct_size, padding_end_size = add_padding_bytes(sorted_fields, search_path) topic_fields = ["%s %s" % (convert_type(field.type), field.name) for field in sorted_fields] }@ -#include <cinttypes> +#include <inttypes.h> #include <px4_log.h> #include <px4_defines.h> #include <uORB/topics/@(topic_name).h> diff --git a/msg/templates/uorb_microcdr/microRTPS_client.cpp.template b/msg/templates/uorb_microcdr/microRTPS_client.cpp.template index 92cb6690c7..1793a764c4 100644 --- a/msg/templates/uorb_microcdr/microRTPS_client.cpp.template +++ b/msg/templates/uorb_microcdr/microRTPS_client.cpp.template @@ -58,7 +58,7 @@ recv_topics = [s.short_name for idx, s in enumerate(spec) if scope[idx] == MsgSc #include "microRTPS_transport.h" #include "microRTPS_client.h" -#include <cinttypes> +#include <inttypes.h> #include <cstdio> #include <ctime> #include <pthread.h> diff --git a/src/lib/cdev/nuttx/cdev_platform.hpp b/src/lib/cdev/nuttx/cdev_platform.hpp index b5b8ab9dac..1174f6ef4d 100644 --- a/src/lib/cdev/nuttx/cdev_platform.hpp +++ b/src/lib/cdev/nuttx/cdev_platform.hpp @@ -1,7 +1,7 @@ #pragma once -#include <cinttypes> +#include <inttypes.h> #include <nuttx/arch.h> diff --git a/src/lib/cdev/posix/cdev_platform.hpp b/src/lib/cdev/posix/cdev_platform.hpp index c93938d70c..92edf12625 100644 --- a/src/lib/cdev/posix/cdev_platform.hpp +++ b/src/lib/cdev/posix/cdev_platform.hpp @@ -1,7 +1,7 @@ #pragma once -#include <cinttypes> +#include <inttypes.h> #define ATOMIC_ENTER lock() #define ATOMIC_LEAVE unlock() diff --git a/src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h b/src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h index e256fd10c5..6254e97f3d 100644 --- a/src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h +++ b/src/modules/micrortps_bridge/micrortps_client/microRTPS_client.h @@ -34,7 +34,7 @@ #include "microRTPS_transport.h" -#include <cinttypes> +#include <inttypes.h> #include <cstdio> #include <ctime> #include <pthread.h> diff --git a/src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp b/src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp index 78fa8f130b..bcb211aaab 100644 --- a/src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp +++ b/src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp @@ -33,7 +33,7 @@ #include "microRTPS_transport.h" #include "microRTPS_client.h" -#include <cinttypes> +#include <inttypes.h> #include <cstdio> #include <cstdlib> #include <ctime> -- GitLab