Skip to content

Convert some static_asserts to concept constraints #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
sangelovic wants to merge 1 commit into
base: feat/release-v3.x
Choose a base branch
from
+11 −9
Draft

Convert some static_asserts to concept constraints #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions include/sdbus-c++/VTableItems.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <sdbus-c++/Types.h>
#include <sdbus-c++/TypeTraits.h>

#include <concepts>
#include <string>
#include <variant>
#include <vector>
Expand All @@ -40,9 +41,9 @@ namespace sdbus {
{
template <typename Function> MethodVTableItem& implementedAs(Function&& callback);
MethodVTableItem& withInputParamNames(std::vector<std::string> names);
template <typename... String> MethodVTableItem& withInputParamNames(String... names);
template <std::convertible_to<std::string>... String> MethodVTableItem& withInputParamNames(String... names);
MethodVTableItem& withOutputParamNames(std::vector<std::string> names);
template <typename... String> MethodVTableItem& withOutputParamNames(String... names);
template <std::convertible_to<std::string>... String> MethodVTableItem& withOutputParamNames(String... names);
MethodVTableItem& markAsDeprecated();
MethodVTableItem& markAsPrivileged();
MethodVTableItem& withNoReply();
Expand All @@ -63,7 +64,9 @@ namespace sdbus {
{
template <typename... Args> SignalVTableItem& withParameters();
template <typename... Args> SignalVTableItem& withParameters(std::vector<std::string> names);
template <typename... Args, typename... String> SignalVTableItem& withParameters(String... names);
template <typename... Args, std::convertible_to<std::string>... String>
requires(sizeof...(Args) == sizeof...(String))
SignalVTableItem& withParameters(String... names);
SignalVTableItem& markAsDeprecated();

SignalName name;
Expand Down
11 changes: 5 additions & 6 deletions include/sdbus-c++/VTableItems.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <sdbus-c++/Error.h>
#include <sdbus-c++/TypeTraits.h>

#include <concepts>
#include <string>
#include <type_traits>
#include <vector>
Expand Down Expand Up @@ -81,7 +82,7 @@ namespace sdbus {
return *this;
}

template <typename... String>
template <std::convertible_to<std::string>... String>
inline MethodVTableItem& MethodVTableItem::withInputParamNames(String... names)
{
static_assert(std::conjunction_v<std::is_convertible<String, std::string>...>, "Parameter names must be (convertible to) strings");
Expand All @@ -96,7 +97,7 @@ namespace sdbus {
return *this;
}

template <typename... String>
template <std::convertible_to<std::string>... String>
inline MethodVTableItem& MethodVTableItem::withOutputParamNames(String... names)
{
static_assert(std::conjunction_v<std::is_convertible<String, std::string>...>, "Parameter names must be (convertible to) strings");
Expand Down Expand Up @@ -155,12 +156,10 @@ namespace sdbus {
return withParameters<Args...>();
}

template <typename... Args, typename... String>
template <typename... Args, std::convertible_to<std::string>... String>
requires(sizeof...(Args) == sizeof...(String))
inline SignalVTableItem& SignalVTableItem::withParameters(String... names)
{
static_assert(std::conjunction_v<std::is_convertible<String, std::string>...>, "Parameter names must be (convertible to) strings");
static_assert(sizeof...(Args) == sizeof...(String), "Numbers of signal parameters and their names don't match");

return withParameters<Args...>({names...});
}

Expand Down
Loading