Changeset 108:e4c5d0d9de8c in finroc_plugins_data_ports

Timestamp:

16.05.2017 00:28:23 (6 years ago)

Author:

Tobias Föhst <foehst@…>

Branch:

14.08

Children:

109:45ca8f1323a7, 111:9fa05a16eed9, 112:4756cdcbb205

Phase:

public

Rebase:

65613966383535623833363061396161616136633238306433313932623833363864663966346539

Message:

Bugfix: enables constructors with port name iterators

File:

• tPortPack.h (modified) (3 diffs)

tPortPack.h

@@ -77 +77 @@
 {
 
+  template <bool value, typename>
+  using CheckIterators = std::integral_constant<bool, value>;
+
 //----------------------------------------------------------------------
 // Public methods and typedefs
@@ -89 +92 @@
   }
 
-  template <typename TIterator>
+  template <typename TIterator, typename std::enable_if<CheckIterators<(Tsize> 1), TIterator>::value, int>::type = 0 >
+      inline tPortPack(core::tFrameworkElement *parent, TIterator names_begin, TIterator names_end) :
+        tPortPack < TPort, TTypeList, Tsize - 1 > (parent, names_begin, names_end - 1),
+        port(*(names_end - 1), parent)
+  {
+    this->port.Init();
+  }
+
+  template <typename TIterator, typename std::enable_if<CheckIterators<(Tsize == 1), TIterator>::value, int>::type = 0>
   inline tPortPack(core::tFrameworkElement *parent, TIterator names_begin, TIterator names_end) :
-    tPortPack < TPort, TTypeList, Tsize - 1 > (parent, names_begin, names_end - 1),
-    port(names_end - 1, parent)
+    tPortPack < TPort, TTypeList, Tsize - 1 > (parent, *names_begin),
+    port(*names_begin, parent)
   {
     this->port.Init();
@@ -134 +145 @@
   inline tPortPack(core::tFrameworkElement *parent, const std::string &name_prefix)
   {}
+
+  template <typename TIterator>
+  inline tPortPack(core::tFrameworkElement *parent, TIterator names_begin, TIterator names_end)
+  {}
+
   inline core::tPortWrapperBase &GetPort(size_t index)
   {