MakeString<> helper template

libuavcan/include/uavcan/marshal/array.hpp

@@ -1087,6 +1087,19 @@ inline bool operator!=(const R& rhs, const Array<T, ArrayMode, MaxSize>& lhs)
     return lhs.operator!=(rhs);
 }
 
+/**
+ * Shortcut for string-like array type instantiation.
+ * The proper way of doing this is actually "template<> using ... = ...", but this feature is not available in
+ * older C++ revisions which the library has to support.
+ */
+template <unsigned MaxSize>
+class MakeString
+{
+    MakeString();       // This class is not instantiatable.
+public:
+    typedef Array<IntegerSpec<8, SignednessUnsigned, CastModeSaturate>, ArrayModeDynamic, MaxSize> Type;
+};
+
 /**
  * YAML streamer specification for any Array<>
  */

libuavcan/include/uavcan/protocol/dynamic_node_id_server/storage_backend.hpp

@@ -37,7 +37,7 @@ public:
      * This type is used to exchange data chunks with the backend.
      * It doesn't use any dynamic memory; please refer to the Array<> class for details.
      */
-    typedef Array<IntegerSpec<8, SignednessUnsigned, CastModeTruncate>, ArrayModeDynamic, MaxStringLength> String;
+    typedef MakeString<MaxStringLength>::Type String;
 
     /**
      * Read one value from the storage.

libuavcan_drivers/posix/include/uavcan_posix/dynamic_node_id_server/file_event_tracer.hpp

@@ -34,8 +34,7 @@ class FileEventTracer : public uavcan::dynamic_node_id_server::IEventTracer
     /**
      * This type is used for the path
      */
-    typedef uavcan::Array<uavcan::IntegerSpec<8, uavcan::SignednessUnsigned, uavcan::CastModeTruncate>,
-                          uavcan::ArrayModeDynamic, MaxPathLength> PathString;
+    typedef uavcan::MakeString<MaxPathLength>::Type PathString;
 
     PathString path_;
 

libuavcan_drivers/posix/include/uavcan_posix/dynamic_node_id_server/file_storage_backend.hpp

@@ -39,8 +39,7 @@ class FileStorageBackend : public uavcan::dynamic_node_id_server::IStorageBacken
     /**
      * This type is used for the path
      */
-    typedef uavcan::Array<uavcan::IntegerSpec<8, uavcan::SignednessUnsigned, uavcan::CastModeTruncate>,
-                          uavcan::ArrayModeDynamic, MaxPathLength> PathString;
+    typedef uavcan::MakeString<MaxPathLength>::Type PathString;
 
     PathString base_path;