Automatic selection between <stdint.h> and <cstdint> depending on the C++ standard. This improvement made the library completely independent from the standard C headers in C++11 mode. In C++03 mode, though, some C headers are still needed: <stdint.h>, <math.h>

libuavcan/include/uavcan/can_driver.hpp

@@ -6,9 +6,9 @@
 #pragma once
 
 #include <cassert>
-#include <stdint.h>
 #include <algorithm>
 #include <string>
+#include <uavcan/stdint.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/system_clock.hpp>
 

libuavcan/include/uavcan/data_type.hpp

@@ -7,8 +7,8 @@
 #include <cassert>
 #include <cstring>
 #include <string>
-#include <stdint.h>
 #include <algorithm>
+#include <uavcan/stdint.hpp>
 #include <uavcan/transport/transfer.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/dynamic_memory.hpp

@@ -9,7 +9,7 @@
 #include <cstring>
 #include <algorithm>
 #include <limits>
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 #include <uavcan/util/compile_time.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/map.hpp

@@ -6,7 +6,6 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <stdint.h>
 #include <uavcan/linked_list.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/dynamic_memory.hpp>

libuavcan/include/uavcan/marshal/bit_stream.hpp

@@ -5,8 +5,8 @@
 #pragma once
 
 #include <cassert>
-#include <stdint.h>
 #include <string>
+#include <uavcan/stdint.hpp>
 #include <uavcan/util/compile_time.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/marshal/float_spec.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <stdint.h>
 #include <limits>
+#include <uavcan/stdint.hpp>
 #include <uavcan/data_type.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/impl_constants.hpp>

libuavcan/include/uavcan/marshal/integer_spec.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <stdint.h>
 #include <limits>
+#include <uavcan/stdint.hpp>
 #include <uavcan/data_type.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/marshal/scalar_codec.hpp>

libuavcan/include/uavcan/marshal/scalar_codec.hpp

@@ -5,9 +5,9 @@
 #pragma once
 
 #include <cassert>
-#include <stdint.h>
 #include <limits>
 #include <string>
+#include <uavcan/stdint.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/marshal/bit_stream.hpp>
 

libuavcan/include/uavcan/node/global_data_type_registry.hpp

@@ -6,8 +6,8 @@
 
 #include <cassert>
 #include <bitset>
-#include <stdint.h>
 #include <algorithm>
+#include <uavcan/stdint.hpp>
 #include <uavcan/data_type.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/fatal_error.hpp>

libuavcan/include/uavcan/node/timer.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 #include <uavcan/node/scheduler.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/node/abstract_node.hpp>

libuavcan/include/uavcan/stdint.hpp

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
+ */
+
+#pragma once
+
+#include <uavcan/impl_constants.hpp>
+
+#if !defined(UAVCAN_CPP_VERSION) || !defined(UAVCAN_CPP11)
+# error UAVCAN_CPP_VERSION
+#endif
+
+#if UAVCAN_CPP_VERSION >= UAVCAN_CPP11
+
+# include <cstdint>
+
+namespace uavcan
+{
+
+using std::uint8_t;
+using std::uint16_t;
+using std::uint32_t;
+using std::uint64_t;
+
+using std::int8_t;
+using std::int16_t;
+using std::int32_t;
+using std::int64_t;
+
+}
+
+#else
+
+# include <stdint.h>
+
+namespace uavcan
+{
+
+typedef ::uint8_t uint8_t;
+typedef ::uint16_t uint16_t;
+typedef ::uint32_t uint32_t;
+typedef ::uint64_t uint64_t;
+
+typedef ::int8_t int8_t;
+typedef ::int16_t int16_t;
+typedef ::int32_t int32_t;
+typedef ::int64_t int64_t;
+
+}
+
+#endif

libuavcan/include/uavcan/system_clock.hpp

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/time.hpp>
 

libuavcan/include/uavcan/time.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 #include <algorithm>
 #include <limits>
 #include <sstream>

libuavcan/include/uavcan/transport/can_io.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <cassert>
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 #include <uavcan/linked_list.hpp>
 #include <uavcan/dynamic_memory.hpp>
 #include <uavcan/impl_constants.hpp>

libuavcan/include/uavcan/transport/crc.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <cassert>
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/dispatcher.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <cassert>
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 #include <uavcan/transport/transfer_listener.hpp>
 #include <uavcan/transport/outgoing_transfer_registry.hpp>
 #include <uavcan/transport/can_io.hpp>

libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp

@@ -5,8 +5,8 @@
 #pragma once
 
 #include <cassert>
-#include <stdint.h>
 #include <sstream>
+#include <uavcan/stdint.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/map.hpp>
 #include <uavcan/debug.hpp>

libuavcan/include/uavcan/transport/transfer.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <cassert>
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/transfer_buffer.hpp

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include <stdint.h>
 #include <algorithm>
 #include <limits>
+#include <uavcan/stdint.hpp>
 #include <uavcan/transport/frame.hpp>
 #include <uavcan/linked_list.hpp>
 #include <uavcan/dynamic_memory.hpp>

libuavcan/include/uavcan/transport/transfer_listener.hpp

@@ -6,7 +6,7 @@
 
 #include <cassert>
 #include <algorithm>
-#include <stdint.h>
+#include <uavcan/stdint.hpp>
 #include <uavcan/transport/transfer_receiver.hpp>
 #include <uavcan/linked_list.hpp>
 #include <uavcan/map.hpp>