Changeset 490:e387ca5db0fd in finroc_core

Timestamp:

15.12.2021 15:56:35 (2 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

default

Parents:

487:3ae47727c72a (diff), 489:5ad391eb57a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge with 17.03

File:

• port/tPortWrapperBase.h (modified) (3 diffs)

port/tPortWrapperBase.h

@@ -422 +422 @@
       this->Set(std::forward<ARG1>(argument1));
       this->ProcessArguments(std::forward<TArgs>(rest)...);
+      this->ApplyModifier(std::forward<ARG1>(argument1));
     }
 
     /*!
-     * Depending on the TArgument type, calling Set on this class will either
-     * set a suitable parameter in the base class - or execute the modifier
-     * (if TArgument is derived from the tModifier class)
+     * This Set() method will set a suitable parameter in the base class
+     * depending on the type of the argument passed to it.
+     * Modifiers are skipped.
      *
      * A static assertion is thrown if an argument of an invalid type is provided.
@@ -437 +438 @@
       tBase::Set(std::forward<TArgument>(argument));
     }
+    template <typename TArgument, typename = typename std::enable_if <std::is_base_of<tAbstractPortCreationInfo::tModifier, typename std::remove_pointer<typename std::decay<TArgument>::type>::type>::value, int>::type>
+    inline void Set(TArgument& argument)
+    {}
+
+    /*!
+     * If TArgument is a modifier, executes it. Has no effect otherwise.
+     */
+    template < typename TArgument, typename = typename std::enable_if < !std::is_base_of<tAbstractPortCreationInfo::tModifier, typename std::decay<TArgument>::type>::value, int >::type >
+    inline void ApplyModifier(TArgument && argument)
+    {}
     template <typename TArgument, typename = typename std::enable_if<std::is_base_of<tAbstractPortCreationInfo::tModifier, typename std::decay<TArgument>::type>::value, int>::type>
-    inline void Set(TArgument* argument)
+    inline void ApplyModifier(TArgument* argument)
     {
       (*argument)(*this);
     }
     template <typename TArgument, typename = typename std::enable_if<std::is_base_of<tAbstractPortCreationInfo::tModifier, typename std::decay<TArgument>::type>::value, int>::type>
-    inline void Set(TArgument& argument)
+    inline void ApplyModifier(TArgument& argument)
     {
       argument(*this);
@@ -461 +472 @@
       this->Set(std::forward<A>(argument1));
       this->ProcessArguments(std::forward<ARest>(rest)...);
+      this->ApplyModifier(std::forward<A>(argument1));
     }
   };