mirror of
https://github.com/Kistler-Group/sdbus-cpp.git
synced 2025-08-02 19:44:26 +02:00
Be explicit on apply function from sdbus namespace (#17)
This commit is contained in:
committed by
Lukáš Ďurfina
parent
d3d698f02a
commit
fa878e594c
6
include/sdbus-c++/ConvenienceClasses.inl
Normal file → Executable file
6
include/sdbus-c++/ConvenienceClasses.inl
Normal file → Executable file
@@ -73,7 +73,7 @@ namespace sdbus {
|
|||||||
// Invoke callback with input arguments from the tuple.
|
// Invoke callback with input arguments from the tuple.
|
||||||
// For callbacks returning a non-void value, `apply' also returns that value.
|
// For callbacks returning a non-void value, `apply' also returns that value.
|
||||||
// For callbacks returning void, `apply' returns an empty tuple.
|
// 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.
|
// The return value is stored to the reply message.
|
||||||
// In case of void functions, ret is an empty tuple and thus nothing is stored.
|
// In case of void functions, ret is an empty tuple and thus nothing is stored.
|
||||||
@@ -101,7 +101,7 @@ namespace sdbus {
|
|||||||
msg >> inputArgs;
|
msg >> inputArgs;
|
||||||
|
|
||||||
// Invoke callback with input arguments from the tuple.
|
// 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;
|
signal >> signalArgs;
|
||||||
|
|
||||||
// Invoke callback with input arguments from the tuple.
|
// 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 :-(
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user