From fa878e594c0b31cb9b3d731e23441af084a65080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanislav=20Angelovi=C4=8D?= Date: Tue, 24 Jul 2018 12:55:33 +0200 Subject: [PATCH] Be explicit on apply function from sdbus namespace (#17) --- include/sdbus-c++/ConvenienceClasses.inl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 include/sdbus-c++/ConvenienceClasses.inl diff --git a/include/sdbus-c++/ConvenienceClasses.inl b/include/sdbus-c++/ConvenienceClasses.inl old mode 100644 new mode 100755 index d9637ae..50b6d9e --- a/include/sdbus-c++/ConvenienceClasses.inl +++ b/include/sdbus-c++/ConvenienceClasses.inl @@ -73,7 +73,7 @@ namespace sdbus { // Invoke callback with input arguments from the tuple. // For callbacks returning a non-void value, `apply' also returns that value. // For callbacks returning void, `apply' returns an empty tuple. - auto ret = apply(callback, inputArgs); // We don't yet have C++17's std::apply :-( + auto ret = sdbus::apply(callback, inputArgs); // We don't yet have C++17's std::apply :-( // The return value is stored to the reply message. // In case of void functions, ret is an empty tuple and thus nothing is stored. @@ -101,7 +101,7 @@ namespace sdbus { msg >> inputArgs; // Invoke callback with input arguments from the tuple. - apply(callback, std::move(result), inputArgs); // TODO: Use std::apply when switching to full C++17 support + sdbus::apply(callback, std::move(result), inputArgs); // TODO: Use std::apply when switching to full C++17 support }); } @@ -373,7 +373,7 @@ namespace sdbus { signal >> signalArgs; // Invoke callback with input arguments from the tuple. - apply(callback, signalArgs); // We don't yet have C++17's std::apply :-( + sdbus::apply(callback, signalArgs); // We don't yet have C++17's std::apply :-( }); }