Some headers moved to util/ (map, bitset, linked_list); compile_time.hpp renamed to templates.hpp

libuavcan/include/uavcan/dynamic_memory.hpp

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

libuavcan/include/uavcan/marshal/array.hpp

@@ -9,8 +9,8 @@
 #include <cstring>
 #include <cmath>
 #include <uavcan/error.hpp>
-#include <uavcan/bitset.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/bitset.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/marshal/type_util.hpp>
 #include <uavcan/marshal/integer_spec.hpp>

libuavcan/include/uavcan/marshal/bit_stream.hpp

@@ -6,7 +6,7 @@
 
 #include <cassert>
 #include <uavcan/stdint.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/transport/abstract_transfer_buffer.hpp>
 #include <uavcan/impl_constants.hpp>
 

libuavcan/include/uavcan/marshal/float_spec.hpp

@@ -8,7 +8,7 @@
 #include <cmath>
 #include <uavcan/stdint.hpp>
 #include <uavcan/data_type.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/marshal/type_util.hpp>
 #include <uavcan/marshal/integer_spec.hpp>

libuavcan/include/uavcan/marshal/integer_spec.hpp

@@ -7,7 +7,7 @@
 #include <limits>
 #include <uavcan/stdint.hpp>
 #include <uavcan/data_type.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/marshal/scalar_codec.hpp>
 #include <uavcan/marshal/type_util.hpp>
 

libuavcan/include/uavcan/marshal/scalar_codec.hpp

@@ -8,7 +8,7 @@
 #include <limits>
 #include <uavcan/stdint.hpp>
 #include <uavcan/impl_constants.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/marshal/bit_stream.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/marshal/type_util.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/impl_constants.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/node/generic_subscriber.hpp

@@ -8,7 +8,7 @@
 #include <uavcan/node/abstract_node.hpp>
 #include <uavcan/data_type.hpp>
 #include <uavcan/node/global_data_type_registry.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/util/lazy_constructor.hpp>
 #include <uavcan/debug.hpp>
 #include <uavcan/transport/transfer_listener.hpp>

libuavcan/include/uavcan/node/global_data_type_registry.hpp

@@ -8,9 +8,9 @@
 #include <uavcan/error.hpp>
 #include <uavcan/stdint.hpp>
 #include <uavcan/data_type.hpp>
-#include <uavcan/bitset.hpp>
-#include <uavcan/util/compile_time.hpp>
-#include <uavcan/linked_list.hpp>
+#include <uavcan/util/bitset.hpp>
+#include <uavcan/util/templates.hpp>
+#include <uavcan/util/linked_list.hpp>
 #if UAVCAN_DEBUG
 # include <uavcan/debug.hpp>
 #endif

libuavcan/include/uavcan/node/scheduler.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <uavcan/error.hpp>
-#include <uavcan/linked_list.hpp>
+#include <uavcan/util/linked_list.hpp>
 #include <uavcan/transport/dispatcher.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/node/timer.hpp

@@ -7,10 +7,10 @@
 #include <uavcan/stdint.hpp>
 #include <uavcan/error.hpp>
 #include <uavcan/impl_constants.hpp>
-#include <uavcan/linked_list.hpp>
+#include <uavcan/util/linked_list.hpp>
 #include <uavcan/node/scheduler.hpp>
 #include <uavcan/node/abstract_node.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 
 #if !defined(UAVCAN_CPP11) || !defined(UAVCAN_CPP_VERSION)
 # error UAVCAN_CPP_VERSION

libuavcan/include/uavcan/protocol/network_compat_checker.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <uavcan/bitset.hpp>
+#include <uavcan/util/bitset.hpp>
 #include <uavcan/util/method_binder.hpp>
 #include <uavcan/node/subscriber.hpp>
 #include <uavcan/node/service_client.hpp>

libuavcan/include/uavcan/time.hpp

@@ -7,7 +7,7 @@
 #include <limits>
 #include <uavcan/stdint.hpp>
 #include <uavcan/impl_constants.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/Timestamp.hpp>
 
 

libuavcan/include/uavcan/transport/can_io.hpp

@@ -8,10 +8,10 @@
 #include <cassert>
 #include <uavcan/error.hpp>
 #include <uavcan/stdint.hpp>
-#include <uavcan/linked_list.hpp>
+#include <uavcan/util/linked_list.hpp>
 #include <uavcan/dynamic_memory.hpp>
 #include <uavcan/impl_constants.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/util/lazy_constructor.hpp>
 #include <uavcan/driver/can.hpp>
 #include <uavcan/driver/system_clock.hpp>

libuavcan/include/uavcan/transport/dispatcher.hpp

@@ -12,7 +12,7 @@
 #include <uavcan/transport/transfer_listener.hpp>
 #include <uavcan/transport/outgoing_transfer_registry.hpp>
 #include <uavcan/transport/can_io.hpp>
-#include <uavcan/linked_list.hpp>
+#include <uavcan/util/linked_list.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp

@@ -7,7 +7,7 @@
 #include <cassert>
 #include <uavcan/stdint.hpp>
 #include <uavcan/impl_constants.hpp>
-#include <uavcan/map.hpp>
+#include <uavcan/util/map.hpp>
 #include <uavcan/debug.hpp>
 #include <uavcan/transport/transfer.hpp>
 #include <uavcan/time.hpp>

libuavcan/include/uavcan/transport/transfer_buffer.hpp

@@ -9,7 +9,7 @@
 #include <uavcan/error.hpp>
 #include <uavcan/transport/frame.hpp>
 #include <uavcan/transport/abstract_transfer_buffer.hpp>
-#include <uavcan/linked_list.hpp>
+#include <uavcan/util/linked_list.hpp>
 #include <uavcan/dynamic_memory.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/debug.hpp>

libuavcan/include/uavcan/transport/transfer_listener.hpp

@@ -9,8 +9,8 @@
 #include <uavcan/stdint.hpp>
 #include <uavcan/transport/transfer_receiver.hpp>
 #include <uavcan/transport/perf_counter.hpp>
-#include <uavcan/linked_list.hpp>
-#include <uavcan/map.hpp>
+#include <uavcan/util/linked_list.hpp>
+#include <uavcan/util/map.hpp>
 #include <uavcan/debug.hpp>
 #include <uavcan/transport/crc.hpp>
 #include <uavcan/data_type.hpp>

libuavcan/include/uavcan/uavcan.hpp

@@ -19,6 +19,6 @@
 #include <uavcan/node/global_data_type_registry.hpp>
 
 // Util
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 #include <uavcan/util/lazy_constructor.hpp>
 #include <uavcan/util/method_binder.hpp>

libuavcan/include/uavcan/util/lazy_constructor.hpp

@@ -7,7 +7,7 @@
 #include <cstdlib>
 #include <uavcan/error.hpp>
 #include <uavcan/impl_constants.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 
 #ifndef UAVCAN_CPP_VERSION
 # error UAVCAN_CPP_VERSION

libuavcan/include/uavcan/util/map.hpp

@@ -6,10 +6,10 @@
 
 #include <cassert>
 #include <cstdlib>
-#include <uavcan/linked_list.hpp>
+#include <uavcan/util/linked_list.hpp>
 #include <uavcan/impl_constants.hpp>
 #include <uavcan/dynamic_memory.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/util/method_binder.hpp

@@ -6,7 +6,7 @@
 
 #include <uavcan/error.hpp>
 #include <uavcan/impl_constants.hpp>
-#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/templates.hpp>
 
 namespace uavcan
 {