From ce618f643685188e37635b0679ec51149130fa38 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Sun, 9 Mar 2014 21:46:21 +0400
Subject: [PATCH] Utils moved to uavcan/util/*

---
 libuavcan/dsdl_compiler/data_type_template.hpp                | 2 +-
 libuavcan/include/uavcan/internal/dynamic_memory.hpp          | 2 +-
 libuavcan/include/uavcan/internal/impl_constants.hpp          | 2 +-
 libuavcan/include/uavcan/internal/map.hpp                     | 2 +-
 libuavcan/include/uavcan/internal/marshal/array.hpp           | 2 +-
 libuavcan/include/uavcan/internal/marshal/bit_stream.hpp      | 2 +-
 libuavcan/include/uavcan/internal/marshal/float_spec.hpp      | 2 +-
 libuavcan/include/uavcan/internal/marshal/integer_spec.hpp    | 2 +-
 libuavcan/include/uavcan/internal/marshal/scalar_codec.hpp    | 2 +-
 libuavcan/include/uavcan/internal/marshal/type_util.hpp       | 2 +-
 libuavcan/include/uavcan/internal/transport/can_io.hpp        | 2 +-
 libuavcan/include/uavcan/publisher.hpp                        | 2 +-
 libuavcan/include/uavcan/subscriber.hpp                       | 4 ++--
 libuavcan/include/uavcan/timer.hpp                            | 2 +-
 .../uavcan/{internal/util.hpp => util/compile_time.hpp}       | 3 ---
 .../include/uavcan/{internal => util}/lazy_constructor.hpp    | 0
 libuavcan/include/uavcan/{internal => util}/method_binder.hpp | 2 +-
 libuavcan/test/scheduler.cpp                                  | 2 +-
 libuavcan/test/subscriber.cpp                                 | 2 +-
 libuavcan/test/{util.cpp => util/compile_time.cpp}            | 2 +-
 libuavcan/test/{ => util}/lazy_constructor.cpp                | 2 +-
 21 files changed, 20 insertions(+), 23 deletions(-)
 rename libuavcan/include/uavcan/{internal/util.hpp => util/compile_time.hpp} (95%)
 rename libuavcan/include/uavcan/{internal => util}/lazy_constructor.hpp (100%)
 rename libuavcan/include/uavcan/{internal => util}/method_binder.hpp (96%)
 rename libuavcan/test/{util.cpp => util/compile_time.cpp} (96%)
 rename libuavcan/test/{ => util}/lazy_constructor.cpp (96%)

diff --git a/libuavcan/dsdl_compiler/data_type_template.hpp b/libuavcan/dsdl_compiler/data_type_template.hpp
index a0bf0c426c..9035a49c54 100644
--- a/libuavcan/dsdl_compiler/data_type_template.hpp
+++ b/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}>
diff --git a/libuavcan/include/uavcan/internal/dynamic_memory.hpp b/libuavcan/include/uavcan/internal/dynamic_memory.hpp
index 6e22ac262b..003e10d2e0 100644
--- a/libuavcan/include/uavcan/internal/dynamic_memory.hpp
+++ b/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
 {
diff --git a/libuavcan/include/uavcan/internal/impl_constants.hpp b/libuavcan/include/uavcan/internal/impl_constants.hpp
index ae32f5f258..1569eabad7 100644
--- a/libuavcan/include/uavcan/internal/impl_constants.hpp
+++ b/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
 {
diff --git a/libuavcan/include/uavcan/internal/map.hpp b/libuavcan/include/uavcan/internal/map.hpp
index 26cebfe100..21a3adba91 100644
--- a/libuavcan/include/uavcan/internal/map.hpp
+++ b/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
 {
diff --git a/libuavcan/include/uavcan/internal/marshal/array.hpp b/libuavcan/include/uavcan/internal/marshal/array.hpp
index 5ab2a5cb12..bbce37ec12 100644
--- a/libuavcan/include/uavcan/internal/marshal/array.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/internal/marshal/bit_stream.hpp b/libuavcan/include/uavcan/internal/marshal/bit_stream.hpp
index 910a70b82f..7cf907dbe8 100644
--- a/libuavcan/include/uavcan/internal/marshal/bit_stream.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/internal/marshal/float_spec.hpp b/libuavcan/include/uavcan/internal/marshal/float_spec.hpp
index 265b7fc9e2..95042b6057 100644
--- a/libuavcan/include/uavcan/internal/marshal/float_spec.hpp
+++ b/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>
 
diff --git a/libuavcan/include/uavcan/internal/marshal/integer_spec.hpp b/libuavcan/include/uavcan/internal/marshal/integer_spec.hpp
index 073adf0d78..6f051dd5d3 100644
--- a/libuavcan/include/uavcan/internal/marshal/integer_spec.hpp
+++ b/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>
 
diff --git a/libuavcan/include/uavcan/internal/marshal/scalar_codec.hpp b/libuavcan/include/uavcan/internal/marshal/scalar_codec.hpp
index 2e5d67669e..c632ff63be 100644
--- a/libuavcan/include/uavcan/internal/marshal/scalar_codec.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/internal/marshal/type_util.hpp b/libuavcan/include/uavcan/internal/marshal/type_util.hpp
index f1f5613240..440bde0e84 100644
--- a/libuavcan/include/uavcan/internal/marshal/type_util.hpp
+++ b/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
 {
diff --git a/libuavcan/include/uavcan/internal/transport/can_io.hpp b/libuavcan/include/uavcan/internal/transport/can_io.hpp
index 4fecc49479..e537d8e120 100644
--- a/libuavcan/include/uavcan/internal/transport/can_io.hpp
+++ b/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>
 
diff --git a/libuavcan/include/uavcan/publisher.hpp b/libuavcan/include/uavcan/publisher.hpp
index 5c1b3f6f8b..302890e754 100644
--- a/libuavcan/include/uavcan/publisher.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/subscriber.hpp b/libuavcan/include/uavcan/subscriber.hpp
index 8316bf80cc..4a18b37e0e 100644
--- a/libuavcan/include/uavcan/subscriber.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/timer.hpp b/libuavcan/include/uavcan/timer.hpp
index a6ec5bf6f9..ae7f78aa77 100644
--- a/libuavcan/include/uavcan/timer.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/internal/util.hpp b/libuavcan/include/uavcan/util/compile_time.hpp
similarity index 95%
rename from libuavcan/include/uavcan/internal/util.hpp
rename to libuavcan/include/uavcan/util/compile_time.hpp
index 8154223852..48d9ca76e6 100644
--- a/libuavcan/include/uavcan/internal/util.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/internal/lazy_constructor.hpp b/libuavcan/include/uavcan/util/lazy_constructor.hpp
similarity index 100%
rename from libuavcan/include/uavcan/internal/lazy_constructor.hpp
rename to libuavcan/include/uavcan/util/lazy_constructor.hpp
diff --git a/libuavcan/include/uavcan/internal/method_binder.hpp b/libuavcan/include/uavcan/util/method_binder.hpp
similarity index 96%
rename from libuavcan/include/uavcan/internal/method_binder.hpp
rename to libuavcan/include/uavcan/util/method_binder.hpp
index 94582ace65..dcd97ac322 100644
--- a/libuavcan/include/uavcan/internal/method_binder.hpp
+++ b/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
 {
diff --git a/libuavcan/test/scheduler.cpp b/libuavcan/test/scheduler.cpp
index 7ef8894ccb..b8213303cf 100644
--- a/libuavcan/test/scheduler.cpp
+++ b/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"
 
diff --git a/libuavcan/test/subscriber.cpp b/libuavcan/test/subscriber.cpp
index 7d70836174..0bdaa9043e 100644
--- a/libuavcan/test/subscriber.cpp
+++ b/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"
diff --git a/libuavcan/test/util.cpp b/libuavcan/test/util/compile_time.cpp
similarity index 96%
rename from libuavcan/test/util.cpp
rename to libuavcan/test/util/compile_time.cpp
index 76aa2fa20a..5e449036e3 100644
--- a/libuavcan/test/util.cpp
+++ b/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
diff --git a/libuavcan/test/lazy_constructor.cpp b/libuavcan/test/util/lazy_constructor.cpp
similarity index 96%
rename from libuavcan/test/lazy_constructor.cpp
rename to libuavcan/test/util/lazy_constructor.cpp
index 56f7ebcb0a..778a5c0674 100644
--- a/libuavcan/test/lazy_constructor.cpp
+++ b/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)