Some more renamings: marshalling --> marshal

libuavcan/include/uavcan/data_type.hpp

@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <uavcan/internal/transport/crc.hpp>
 #include <uavcan/internal/transport/transfer.hpp>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshal/types.hpp>
 
 namespace uavcan
 {

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

@@ -10,7 +10,7 @@
 #include <typeinfo>
 #include <uavcan/internal/impl_constants.hpp>
 #include <uavcan/internal/util.hpp>
-#include <uavcan/internal/marshalling/type_util.hpp>
+#include <uavcan/internal/marshal/type_util.hpp>
 
 namespace uavcan
 {

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

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

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

@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <limits>
 #include <uavcan/internal/util.hpp>
-#include <uavcan/internal/marshalling/scalar_codec.hpp>
-#include <uavcan/internal/marshalling/type_util.hpp>
+#include <uavcan/internal/marshal/scalar_codec.hpp>
+#include <uavcan/internal/marshal/type_util.hpp>
 
 namespace uavcan
 {

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

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

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

@@ -0,0 +1,10 @@
+/*
+ * 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/internal/marshalling/types.hpp

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

libuavcan/src/marshal/bit_stream.cpp

@@ -4,7 +4,7 @@
 
 #include <cassert>
 #include <sstream>
-#include <uavcan/internal/marshalling/bit_stream.hpp>
+#include <uavcan/internal/marshal/bit_stream.hpp>
 
 namespace uavcan
 {

libuavcan/src/marshal/float_spec.cpp

@@ -2,7 +2,7 @@
  * Copyright (C) 2014 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#include <uavcan/internal/marshalling/float_spec.hpp>
+#include <uavcan/internal/marshal/float_spec.hpp>
 #include <cmath>
 
 namespace uavcan

libuavcan/test/marshal/array.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshal/types.hpp>
 
 using uavcan::Array;
 using uavcan::ArrayModeDynamic;

libuavcan/test/marshal/bit_stream.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/bit_stream.hpp>
+#include <uavcan/internal/marshal/bit_stream.hpp>
 
 
 TEST(BitStream, ToString)

libuavcan/test/marshal/float_spec.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshal/types.hpp>
 
 
 TEST(FloatSpec, Limits)

libuavcan/test/marshal/integer_spec.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/types.hpp>
+#include <uavcan/internal/marshal/types.hpp>
 
 
 TEST(IntegerSpec, Limits)

libuavcan/test/marshal/scalar_codec.cpp

@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/internal/marshalling/scalar_codec.hpp>
+#include <uavcan/internal/marshal/scalar_codec.hpp>
 
 
 TEST(ScalarCodec, Basic)