Reorganized directory structure - directory 'internal' pulled up one level. No logical changes.

libuavcan/include/uavcan/can_driver.hpp

@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <algorithm>
 #include <string>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/impl_constants.hpp>
 #include <uavcan/system_clock.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/data_type.hpp

@@ -9,7 +9,7 @@
 #include <string>
 #include <stdint.h>
 #include <algorithm>
-#include <uavcan/internal/transport/transfer.hpp>
+#include <uavcan/transport/transfer.hpp>
 
 namespace uavcan
 {

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

@@ -1,10 +0,0 @@
-/*
- * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
- */
-
-#pragma once
-
-#include <uavcan/internal/marshal/integer_spec.hpp>
-#include <uavcan/internal/marshal/float_spec.hpp>
-#include <uavcan/internal/marshal/array.hpp>
-#include <uavcan/internal/marshal/type_util.hpp>

libuavcan/include/uavcan/map.hpp

@@ -7,9 +7,9 @@
 #include <cassert>
 #include <cstdlib>
 #include <stdint.h>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/dynamic_memory.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/impl_constants.hpp>
+#include <uavcan/dynamic_memory.hpp>
 #include <uavcan/util/compile_time.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/marshal/array.hpp

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

libuavcan/include/uavcan/marshal/float_spec.hpp

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

libuavcan/include/uavcan/marshal/integer_spec.hpp

@@ -8,8 +8,8 @@
 #include <limits>
 #include <uavcan/data_type.hpp>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/marshal/scalar_codec.hpp>
-#include <uavcan/internal/marshal/type_util.hpp>
+#include <uavcan/marshal/scalar_codec.hpp>
+#include <uavcan/marshal/type_util.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/marshal/scalar_codec.hpp

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

libuavcan/include/uavcan/marshal/types.hpp

@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
+ */
+
+#pragma once
+
+#include <uavcan/marshal/integer_spec.hpp>
+#include <uavcan/marshal/float_spec.hpp>
+#include <uavcan/marshal/array.hpp>
+#include <uavcan/marshal/type_util.hpp>

libuavcan/include/uavcan/node/generic_publisher.hpp

@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <uavcan/internal/node/scheduler.hpp>
+#include <uavcan/node/scheduler.hpp>
 #include <uavcan/data_type.hpp>
-#include <uavcan/internal/node/marshal_buffer.hpp>
-#include <uavcan/global_data_type_registry.hpp>
+#include <uavcan/node/marshal_buffer.hpp>
+#include <uavcan/node/global_data_type_registry.hpp>
 #include <uavcan/util/lazy_constructor.hpp>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/transfer_sender.hpp>
-#include <uavcan/internal/marshal/scalar_codec.hpp>
-#include <uavcan/internal/marshal/types.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/transfer_sender.hpp>
+#include <uavcan/marshal/scalar_codec.hpp>
+#include <uavcan/marshal/types.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/generic_subscriber.hpp

@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <uavcan/internal/node/scheduler.hpp>
+#include <uavcan/node/scheduler.hpp>
 #include <uavcan/data_type.hpp>
-#include <uavcan/global_data_type_registry.hpp>
+#include <uavcan/node/global_data_type_registry.hpp>
 #include <uavcan/util/compile_time.hpp>
 #include <uavcan/util/lazy_constructor.hpp>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/transfer_listener.hpp>
-#include <uavcan/internal/marshal/scalar_codec.hpp>
-#include <uavcan/internal/marshal/types.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/transfer_listener.hpp>
+#include <uavcan/marshal/scalar_codec.hpp>
+#include <uavcan/marshal/types.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/global_data_type_registry.hpp

@@ -10,10 +10,10 @@
 #include <algorithm>
 #include <uavcan/data_type.hpp>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/fatal_error.hpp>
-#include <uavcan/internal/linked_list.hpp>
+#include <uavcan/fatal_error.hpp>
+#include <uavcan/linked_list.hpp>
 #if UAVCAN_DEBUG
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/debug.hpp>
 #endif
 
 namespace uavcan

libuavcan/include/uavcan/node/marshal_buffer.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/transport/transfer.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/publisher.hpp

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

libuavcan/include/uavcan/node/scheduler.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/transport/dispatcher.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/transport/dispatcher.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/service_client.hpp

@@ -2,8 +2,8 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <uavcan/internal/node/generic_publisher.hpp>
-#include <uavcan/internal/node/generic_subscriber.hpp>
+#include <uavcan/node/generic_publisher.hpp>
+#include <uavcan/node/generic_subscriber.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/service_server.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <uavcan/internal/node/generic_publisher.hpp>
-#include <uavcan/internal/node/generic_subscriber.hpp>
+#include <uavcan/node/generic_publisher.hpp>
+#include <uavcan/node/generic_subscriber.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/subscriber.hpp

@@ -5,7 +5,7 @@
 #pragma once
 
 #include <cassert>
-#include <uavcan/internal/node/generic_subscriber.hpp>
+#include <uavcan/node/generic_subscriber.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/node/timer.hpp

@@ -5,10 +5,10 @@
 #pragma once
 
 #include <stdint.h>
-#include <uavcan/internal/node/scheduler.hpp>
+#include <uavcan/node/scheduler.hpp>
 #include <uavcan/util/compile_time.hpp>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/fatal_error.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/fatal_error.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/system_clock.hpp

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

libuavcan/include/uavcan/transport/can_io.hpp

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

libuavcan/include/uavcan/transport/dispatcher.hpp

@@ -6,10 +6,10 @@
 
 #include <cassert>
 #include <stdint.h>
-#include <uavcan/internal/transport/transfer_listener.hpp>
-#include <uavcan/internal/transport/outgoing_transfer_registry.hpp>
-#include <uavcan/internal/transport/can_io.hpp>
-#include <uavcan/internal/linked_list.hpp>
+#include <uavcan/transport/transfer_listener.hpp>
+#include <uavcan/transport/outgoing_transfer_registry.hpp>
+#include <uavcan/transport/can_io.hpp>
+#include <uavcan/linked_list.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/frame.hpp

@@ -7,8 +7,8 @@
 #include <cassert>
 #include <algorithm>
 #include <string>
-#include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/transport/can_io.hpp>
+#include <uavcan/transport/transfer.hpp>
+#include <uavcan/transport/can_io.hpp>
 #include <uavcan/data_type.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/transport/outgoing_transfer_registry.hpp

@@ -7,11 +7,10 @@
 #include <cassert>
 #include <stdint.h>
 #include <sstream>
-#include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/map.hpp>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/impl_constants.hpp>
+#include <uavcan/map.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/transfer.hpp>
 #include <uavcan/time.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/transport/transfer_buffer.hpp

@@ -7,11 +7,11 @@
 #include <stdint.h>
 #include <algorithm>
 #include <limits>
-#include <uavcan/internal/transport/frame.hpp>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/dynamic_memory.hpp>
-#include <uavcan/internal/impl_constants.hpp>
-#include <uavcan/internal/debug.hpp>
+#include <uavcan/transport/frame.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/dynamic_memory.hpp>
+#include <uavcan/impl_constants.hpp>
+#include <uavcan/debug.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/transfer_listener.hpp

@@ -7,11 +7,11 @@
 #include <cassert>
 #include <algorithm>
 #include <stdint.h>
-#include <uavcan/internal/transport/transfer_receiver.hpp>
-#include <uavcan/internal/linked_list.hpp>
-#include <uavcan/internal/map.hpp>
-#include <uavcan/internal/debug.hpp>
-#include <uavcan/internal/transport/crc.hpp>
+#include <uavcan/transport/transfer_receiver.hpp>
+#include <uavcan/linked_list.hpp>
+#include <uavcan/map.hpp>
+#include <uavcan/debug.hpp>
+#include <uavcan/transport/crc.hpp>
 #include <uavcan/data_type.hpp>
 
 namespace uavcan

libuavcan/include/uavcan/transport/transfer_receiver.hpp

@@ -5,8 +5,8 @@
 #pragma once
 
 #include <cstdlib>
-#include <uavcan/internal/transport/frame.hpp>
-#include <uavcan/internal/transport/transfer_buffer.hpp>
+#include <uavcan/transport/frame.hpp>
+#include <uavcan/transport/transfer_buffer.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/transport/transfer_sender.hpp

@@ -7,9 +7,9 @@
 #include <cstdlib>
 #include <cassert>
 #include <uavcan/data_type.hpp>
-#include <uavcan/internal/transport/crc.hpp>
-#include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/transport/dispatcher.hpp>
+#include <uavcan/transport/crc.hpp>
+#include <uavcan/transport/transfer.hpp>
+#include <uavcan/transport/dispatcher.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/util/lazy_constructor.hpp

@@ -5,8 +5,8 @@
 #pragma once
 
 #include <cstdlib>
-#include <uavcan/internal/fatal_error.hpp>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/fatal_error.hpp>
+#include <uavcan/impl_constants.hpp>
 
 namespace uavcan
 {

libuavcan/include/uavcan/util/method_binder.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <uavcan/internal/fatal_error.hpp>
-#include <uavcan/internal/impl_constants.hpp>
+#include <uavcan/fatal_error.hpp>
+#include <uavcan/impl_constants.hpp>
 #include <uavcan/util/compile_time.hpp>
 
 namespace uavcan