Utils moved to uavcan/util/*

libuavcan/dsdl_compiler/data_type_template.hpp

@@ -11,7 +11,7 @@
 #include <uavcan/data_type.hpp>
 #include <uavcan/global_data_type_registry.hpp>
 #include <uavcan/internal/marshal/types.hpp>
-#include <uavcan/internal/util.hpp>
+#include <uavcan/util/compile_time.hpp>
 
 % for inc in t.cpp_includes:
 #include <${inc}>

libuavcan/include/uavcan/internal/dynamic_memory.hpp

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

libuavcan/include/uavcan/internal/impl_constants.hpp

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

libuavcan/include/uavcan/internal/map.hpp

@@ -10,7 +10,7 @@
 #include <uavcan/internal/linked_list.hpp>
 #include <uavcan/internal/impl_constants.hpp>
 #include <uavcan/internal/dynamic_memory.hpp>
-#include <uavcan/internal/util.hpp>
+#include <uavcan/util/compile_time.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/internal/marshal/array.hpp

@@ -8,8 +8,8 @@
 #include <algorithm>
 #include <stdexcept>
 #include <cstring>
+#include <uavcan/util/compile_time.hpp>
 #include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/util.hpp>
 #include <uavcan/internal/marshal/type_util.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/internal/marshal/bit_stream.hpp

@@ -7,7 +7,7 @@
 #include <cassert>
 #include <stdint.h>
 #include <string>
-#include <uavcan/internal/util.hpp>
+#include <uavcan/util/compile_time.hpp>
 #include <uavcan/internal/transport/transfer_buffer.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/internal/marshal/float_spec.hpp

@@ -8,7 +8,7 @@
 #include <limits>
 #include <math.h>            // Needed for isfinite
 #include <uavcan/data_type.hpp>
-#include <uavcan/internal/util.hpp>
+#include <uavcan/util/compile_time.hpp>
 #include <uavcan/internal/marshal/type_util.hpp>
 #include <uavcan/internal/marshal/integer_spec.hpp>
 

libuavcan/include/uavcan/internal/marshal/integer_spec.hpp

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

libuavcan/include/uavcan/internal/marshal/scalar_codec.hpp

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

libuavcan/include/uavcan/internal/marshal/type_util.hpp

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

libuavcan/include/uavcan/internal/transport/can_io.hpp

@@ -10,7 +10,7 @@
 #include <uavcan/internal/linked_list.hpp>
 #include <uavcan/internal/dynamic_memory.hpp>
 #include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/util.hpp>
+#include <uavcan/util/compile_time.hpp>
 #include <uavcan/can_driver.hpp>
 #include <uavcan/system_clock.hpp>
 

libuavcan/include/uavcan/publisher.hpp

@@ -8,8 +8,8 @@
 #include <uavcan/data_type.hpp>
 #include <uavcan/marshal_buffer.hpp>
 #include <uavcan/global_data_type_registry.hpp>
+#include <uavcan/util/lazy_constructor.hpp>
 #include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/lazy_constructor.hpp>
 #include <uavcan/internal/transport/transfer_sender.hpp>
 #include <uavcan/internal/marshal/scalar_codec.hpp>
 #include <uavcan/internal/marshal/types.hpp>

libuavcan/include/uavcan/subscriber.hpp

@@ -8,9 +8,9 @@
 #include <uavcan/data_type.hpp>
 #include <uavcan/global_data_type_registry.hpp>
 #include <uavcan/received_data_structure.hpp>
+#include <uavcan/util/compile_time.hpp>
+#include <uavcan/util/lazy_constructor.hpp>
 #include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/util.hpp>
-#include <uavcan/internal/lazy_constructor.hpp>
 #include <uavcan/internal/transport/transfer_listener.hpp>
 #include <uavcan/internal/marshal/scalar_codec.hpp>
 #include <uavcan/internal/marshal/types.hpp>

libuavcan/include/uavcan/timer.hpp

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <uavcan/scheduler.hpp>
-#include <uavcan/internal/util.hpp>
+#include <uavcan/util/compile_time.hpp>
 #include <uavcan/internal/linked_list.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/util/compile_time.hpp

@@ -108,6 +108,3 @@ To try_implicit_cast(const From& from, const To& default_ = To())
 }
 
 }
-
-/// Ensure that conditional comilation macros are present
-#include <uavcan/internal/impl_constants.hpp>

libuavcan/include/uavcan/util/method_binder.hpp

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

libuavcan/test/scheduler.cpp

@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <uavcan/timer.hpp>
-#include <uavcan/internal/method_binder.hpp>
+#include <uavcan/util/method_binder.hpp>
 #include "common.hpp"
 #include "transport/can/iface_mock.hpp"
 

libuavcan/test/subscriber.cpp

@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <uavcan/subscriber.hpp>
-#include <uavcan/internal/method_binder.hpp>
+#include <uavcan/util/method_binder.hpp>
 #include <uavcan/mavlink/Message.hpp>
 #include "common.hpp"
 #include "transport/can/iface_mock.hpp"

libuavcan/test/util/compile_time.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/util.hpp>
+#include <uavcan/util/compile_time.hpp>
 
 struct NonConvertible { };
 struct ConvertibleToBool

libuavcan/test/util/lazy_constructor.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/lazy_constructor.hpp>
+#include <uavcan/util/lazy_constructor.hpp>
 
 
 TEST(LazyConstructor, Basic)