From ad3c0af324a3b446c5c1763bb28f3ffe9b5854a0 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Mon, 5 May 2014 14:17:04 +0400
Subject: [PATCH] Some headers moved to util/ (map, bitset, linked_list);
 compile_time.hpp renamed to templates.hpp

---
 libuavcan/include/uavcan/dynamic_memory.hpp                 | 2 +-
 libuavcan/include/uavcan/marshal/array.hpp                  | 4 ++--
 libuavcan/include/uavcan/marshal/bit_stream.hpp             | 2 +-
 libuavcan/include/uavcan/marshal/float_spec.hpp             | 2 +-
 libuavcan/include/uavcan/marshal/integer_spec.hpp           | 2 +-
 libuavcan/include/uavcan/marshal/scalar_codec.hpp           | 2 +-
 libuavcan/include/uavcan/marshal/type_util.hpp              | 2 +-
 libuavcan/include/uavcan/node/generic_subscriber.hpp        | 2 +-
 libuavcan/include/uavcan/node/global_data_type_registry.hpp | 6 +++---
 libuavcan/include/uavcan/node/scheduler.hpp                 | 2 +-
 libuavcan/include/uavcan/node/timer.hpp                     | 4 ++--
 .../include/uavcan/protocol/network_compat_checker.hpp      | 2 +-
 libuavcan/include/uavcan/time.hpp                           | 2 +-
 libuavcan/include/uavcan/transport/can_io.hpp               | 4 ++--
 libuavcan/include/uavcan/transport/dispatcher.hpp           | 2 +-
 .../include/uavcan/transport/outgoing_transfer_registry.hpp | 2 +-
 libuavcan/include/uavcan/transport/transfer_buffer.hpp      | 2 +-
 libuavcan/include/uavcan/transport/transfer_listener.hpp    | 4 ++--
 libuavcan/include/uavcan/uavcan.hpp                         | 2 +-
 libuavcan/include/uavcan/{ => util}/bitset.hpp              | 0
 libuavcan/include/uavcan/util/lazy_constructor.hpp          | 2 +-
 libuavcan/include/uavcan/{ => util}/linked_list.hpp         | 0
 libuavcan/include/uavcan/{ => util}/map.hpp                 | 4 ++--
 libuavcan/include/uavcan/util/method_binder.hpp             | 2 +-
 .../include/uavcan/util/{compile_time.hpp => templates.hpp} | 0
 25 files changed, 29 insertions(+), 29 deletions(-)
 rename libuavcan/include/uavcan/{ => util}/bitset.hpp (100%)
 rename libuavcan/include/uavcan/{ => util}/linked_list.hpp (100%)
 rename libuavcan/include/uavcan/{ => util}/map.hpp (99%)
 rename libuavcan/include/uavcan/util/{compile_time.hpp => templates.hpp} (100%)

diff --git a/libuavcan/include/uavcan/dynamic_memory.hpp b/libuavcan/include/uavcan/dynamic_memory.hpp
index 63ddc1c7d2..927b8f392a 100644
--- a/libuavcan/include/uavcan/dynamic_memory.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/marshal/array.hpp b/libuavcan/include/uavcan/marshal/array.hpp
index 85b668ae77..ac543c80c8 100644
--- a/libuavcan/include/uavcan/marshal/array.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/marshal/bit_stream.hpp b/libuavcan/include/uavcan/marshal/bit_stream.hpp
index c60ea405d9..b98f91e686 100644
--- a/libuavcan/include/uavcan/marshal/bit_stream.hpp
+++ b/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>
 
diff --git a/libuavcan/include/uavcan/marshal/float_spec.hpp b/libuavcan/include/uavcan/marshal/float_spec.hpp
index b96485168b..7c110f896f 100644
--- a/libuavcan/include/uavcan/marshal/float_spec.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/marshal/integer_spec.hpp b/libuavcan/include/uavcan/marshal/integer_spec.hpp
index 14c2cb7485..a0a6e298e1 100644
--- a/libuavcan/include/uavcan/marshal/integer_spec.hpp
+++ b/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>
 
diff --git a/libuavcan/include/uavcan/marshal/scalar_codec.hpp b/libuavcan/include/uavcan/marshal/scalar_codec.hpp
index 6e4ef5d4b0..2b7bceb0eb 100644
--- a/libuavcan/include/uavcan/marshal/scalar_codec.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/marshal/type_util.hpp b/libuavcan/include/uavcan/marshal/type_util.hpp
index edb248eef9..149f3411f6 100644
--- a/libuavcan/include/uavcan/marshal/type_util.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/node/generic_subscriber.hpp b/libuavcan/include/uavcan/node/generic_subscriber.hpp
index ba2c815128..d950a930e2 100644
--- a/libuavcan/include/uavcan/node/generic_subscriber.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/node/global_data_type_registry.hpp b/libuavcan/include/uavcan/node/global_data_type_registry.hpp
index 5e4e4d90f4..e6bc11180e 100644
--- a/libuavcan/include/uavcan/node/global_data_type_registry.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/node/scheduler.hpp b/libuavcan/include/uavcan/node/scheduler.hpp
index fa99083b59..20623a7555 100644
--- a/libuavcan/include/uavcan/node/scheduler.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/node/timer.hpp b/libuavcan/include/uavcan/node/timer.hpp
index 4918fba7ab..1ba5c599b8 100644
--- a/libuavcan/include/uavcan/node/timer.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/protocol/network_compat_checker.hpp b/libuavcan/include/uavcan/protocol/network_compat_checker.hpp
index 61ed7f1fe4..2f72c189a7 100644
--- a/libuavcan/include/uavcan/protocol/network_compat_checker.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/time.hpp b/libuavcan/include/uavcan/time.hpp
index 3c5bb50763..68c7b51286 100644
--- a/libuavcan/include/uavcan/time.hpp
+++ b/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>
 
 
diff --git a/libuavcan/include/uavcan/transport/can_io.hpp b/libuavcan/include/uavcan/transport/can_io.hpp
index dfa9fa91b3..0fcc6e152a 100644
--- a/libuavcan/include/uavcan/transport/can_io.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/transport/dispatcher.hpp b/libuavcan/include/uavcan/transport/dispatcher.hpp
index ec35205885..48b73b6744 100644
--- a/libuavcan/include/uavcan/transport/dispatcher.hpp
+++ b/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
 {
diff --git a/libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp b/libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp
index 8618cd702a..876da5c1d9 100644
--- a/libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/transport/transfer_buffer.hpp b/libuavcan/include/uavcan/transport/transfer_buffer.hpp
index 4835d67350..7969338b82 100644
--- a/libuavcan/include/uavcan/transport/transfer_buffer.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/transport/transfer_listener.hpp b/libuavcan/include/uavcan/transport/transfer_listener.hpp
index 78e5b00deb..49c61cca40 100644
--- a/libuavcan/include/uavcan/transport/transfer_listener.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/uavcan.hpp b/libuavcan/include/uavcan/uavcan.hpp
index 69e3097355..31e2a9f57f 100644
--- a/libuavcan/include/uavcan/uavcan.hpp
+++ b/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>
diff --git a/libuavcan/include/uavcan/bitset.hpp b/libuavcan/include/uavcan/util/bitset.hpp
similarity index 100%
rename from libuavcan/include/uavcan/bitset.hpp
rename to libuavcan/include/uavcan/util/bitset.hpp
diff --git a/libuavcan/include/uavcan/util/lazy_constructor.hpp b/libuavcan/include/uavcan/util/lazy_constructor.hpp
index 5cd4903a69..bea0b4f7ac 100644
--- a/libuavcan/include/uavcan/util/lazy_constructor.hpp
+++ b/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
diff --git a/libuavcan/include/uavcan/linked_list.hpp b/libuavcan/include/uavcan/util/linked_list.hpp
similarity index 100%
rename from libuavcan/include/uavcan/linked_list.hpp
rename to libuavcan/include/uavcan/util/linked_list.hpp
diff --git a/libuavcan/include/uavcan/map.hpp b/libuavcan/include/uavcan/util/map.hpp
similarity index 99%
rename from libuavcan/include/uavcan/map.hpp
rename to libuavcan/include/uavcan/util/map.hpp
index 4ca20b1e9d..0f912140d1 100644
--- a/libuavcan/include/uavcan/map.hpp
+++ b/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
 {
diff --git a/libuavcan/include/uavcan/util/method_binder.hpp b/libuavcan/include/uavcan/util/method_binder.hpp
index e2c711e734..9582a70cc1 100644
--- a/libuavcan/include/uavcan/util/method_binder.hpp
+++ b/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
 {
diff --git a/libuavcan/include/uavcan/util/compile_time.hpp b/libuavcan/include/uavcan/util/templates.hpp
similarity index 100%
rename from libuavcan/include/uavcan/util/compile_time.hpp
rename to libuavcan/include/uavcan/util/templates.hpp