Skip to content

M
mpd
Commit bdfe6c2c authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

lib/dbus/Values: use `using` instead of `typedef`

parent 5e1a2e2a
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
src/lib/dbus/Values.hxx
View file @ bdfe6c2c
...@@ -48,20 +48,20 @@ struct BasicValue { ...@@ -48,20 +48,20 @@ struct BasicValue {
const T &value; const T &value;
explicit constexpr BasicValue(const T &_value) noexcept explicit constexpr BasicValue(const T &_value) noexcept
:value(_value) {} :value(_value) {}
}; };
struct String : BasicValue<const char *> { struct String : BasicValue<const char *> {
explicit constexpr String(const char *const&_value) noexcept explicit constexpr String(const char *const&_value) noexcept
:BasicValue(_value) {} :BasicValue(_value) {}
}; };
struct Boolean { struct Boolean {
typedef BooleanTypeTraits Traits; using Traits = BooleanTypeTraits;
dbus_bool_t value; dbus_bool_t value;
explicit constexpr Boolean(bool _value) noexcept explicit constexpr Boolean(bool _value) noexcept
:value(_value) {} :value(_value) {}
}; };
using Uint32 = BasicValue<dbus_uint32_t>; using Uint32 = BasicValue<dbus_uint32_t>;
...@@ -69,21 +69,21 @@ using Uint64 = BasicValue<dbus_uint64_t>; ...@@ -69,21 +69,21 @@ using Uint64 = BasicValue<dbus_uint64_t>;
template<typename T, template<typename U> class WrapTraits> template<typename T, template<typename U> class WrapTraits>
struct WrapValue { struct WrapValue {
typedef typename T::Traits ContainedTraits; using ContainedTraits = typename T::Traits;
typedef WrapTraits<ContainedTraits> Traits; using Traits = WrapTraits<ContainedTraits>;
const T &value; const T &value;
explicit constexpr WrapValue(const T &_value) noexcept explicit constexpr WrapValue(const T &_value) noexcept
:value(_value) {} :value(_value) {}
}; };
template<typename T> template<typename T>
struct WrapVariant : BasicValue<T> { struct WrapVariant : BasicValue<T> {
typedef typename T::Traits ContainedTraits; using ContainedTraits = typename T::Traits;
typedef VariantTypeTraits Traits; using Traits = VariantTypeTraits;
explicit constexpr WrapVariant(const T &_value) noexcept explicit constexpr WrapVariant(const T &_value) noexcept
:BasicValue<T>(_value) {} :BasicValue<T>(_value) {}
}; };
template<typename T> template<typename T>
...@@ -93,13 +93,13 @@ static WrapVariant<T> Variant(const T &_value) noexcept { ...@@ -93,13 +93,13 @@ static WrapVariant<T> Variant(const T &_value) noexcept {
template<typename T> template<typename T>
struct WrapFixedArray { struct WrapFixedArray {
typedef TypeTraits<T> ContainedTraits; using ContainedTraits = TypeTraits<T>;
typedef ArrayTypeTraits<ContainedTraits> Traits; using Traits = ArrayTypeTraits<ContainedTraits>;
ConstBuffer<T> value; ConstBuffer<T> value;
explicit constexpr WrapFixedArray(const T *_data, explicit constexpr WrapFixedArray(const T *_data,
size_t _size) noexcept size_t _size) noexcept
:value(_data, _size) {} :value(_data, _size) {}
}; };
template<typename T> template<typename T>
...@@ -110,12 +110,12 @@ static WrapFixedArray<T> FixedArray(const T *_data, ...@@ -110,12 +110,12 @@ static WrapFixedArray<T> FixedArray(const T *_data,
template<typename... T> template<typename... T>
struct WrapStruct { struct WrapStruct {
typedef StructTypeTraits<T...> Traits; using Traits = StructTypeTraits<T...>;
std::tuple<const T&...> values; std::tuple<const T&...> values;
explicit constexpr WrapStruct(const T&... _values) noexcept explicit constexpr WrapStruct(const T&... _values) noexcept
:values(_values...) {} :values(_values...) {}
}; };
template<typename... T> template<typename... T>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment