Forward args to forEach

mkrzewic · matthiasrichter · commit 0eccb95ee261 · 2018-06-12T16:22:13.000+02:00
diff --git a/Utilities/O2Device/include/O2Device/Utilities.h b/Utilities/O2Device/include/O2Device/Utilities.h
@@ -81,7 +81,7 @@ namespace internal
 {
 
 template <typename I, typename F>
-auto forEach(I begin, I end, F function)
+auto forEach(I begin, I end, F&& function)
 {
   using span = gsl::span<const byte>;
   using gsl::narrow_cast;
@@ -110,14 +110,14 @@ auto forEach(I begin, I end, F function)
 /// Execute user code (e.g. a lambda) on each data block (header-payload pair)
 /// returns the function (same as std::for_each)
 template <typename F>
-auto forEach(O2Message& parts, F function)
+auto forEach(O2Message& parts, F&& function)
 {
   if ((parts.Size() % 2) != 0) {
     throw std::invalid_argument(
       "number of parts in message not even (n%2 != 0), cannot be considered an O2 compliant message");
   }
 
-  return internal::forEach(parts.begin(), parts.end(), function);
+  return internal::forEach(parts.begin(), parts.end(), std::forward<F>(function));
 }
 
 }; //namespace o2

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ namespace internal`
`81`	`81`	`{`
`82`	`82`
`83`	`83`	`template <typename I, typename F>`
`84`		`-auto forEach(I begin, I end, F function)`
	`84`	`+auto forEach(I begin, I end, F&& function)`
`85`	`85`	`{`
`86`	`86`	`using span = gsl::span<const byte>;`
`87`	`87`	`using gsl::narrow_cast;`
`@@ -110,14 +110,14 @@ auto forEach(I begin, I end, F function)`
`110`	`110`	`/// Execute user code (e.g. a lambda) on each data block (header-payload pair)`
`111`	`111`	`/// returns the function (same as std::for_each)`
`112`	`112`	`template <typename F>`
`113`		`-auto forEach(O2Message& parts, F function)`
	`113`	`+auto forEach(O2Message& parts, F&& function)`
`114`	`114`	`{`
`115`	`115`	`if ((parts.Size() % 2) != 0) {`
`116`	`116`	`throw std::invalid_argument(`
`117`	`117`	`"number of parts in message not even (n%2 != 0), cannot be considered an O2 compliant message");`
`118`	`118`	`}`
`119`	`119`
`120`		`- return internal::forEach(parts.begin(), parts.end(), function);`
	`120`	`+ return internal::forEach(parts.begin(), parts.end(), std::forward<F>(function));`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`}; //namespace o2`