Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
fc01d11b
Commit
fc01d11b
authored
Oct 23, 2020
by
Max Kellermann
Committed by
Max Kellermann
Nov 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
odbus/Types: use `using` instead of `typedef`
parent
0c28d8dc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
Types.hxx
src/lib/dbus/Types.hxx
+12
-8
No files found.
src/lib/dbus/Types.hxx
View file @
fc01d11b
/*
* Copyright 2007-20
17 Content Management AG
* Copyright 2007-20
20 CM4all GmbH
* All rights reserved.
*
* author: Max Kellermann <mk@cm4all.com>
...
...
@@ -42,7 +42,7 @@ namespace ODBus {
template
<
int
type
>
struct
BasicTypeTraits
{
static
constexpr
int
TYPE
=
type
;
typedef
TemplateString
::
CharAsString
<
TYPE
>
TypeAsString
;
using
TypeAsString
=
TemplateString
::
CharAsString
<
TYPE
>
;
};
template
<
typename
T
>
...
...
@@ -70,20 +70,23 @@ using BooleanTypeTraits = BasicTypeTraits<DBUS_TYPE_BOOLEAN>;
template
<
typename
T
>
struct
ArrayTypeTraits
{
typedef
T
ContainedTraits
;
using
ContainedTraits
=
T
;
static
constexpr
int
TYPE
=
DBUS_TYPE_ARRAY
;
typedef
TemplateString
::
InsertBefore
<
TYPE
,
typename
ContainedTraits
::
TypeAsString
>
TypeAsString
;
using
TypeAsString
=
TemplateString
::
InsertBefore
<
TYPE
,
typename
ContainedTraits
::
TypeAsString
>
;
};
template
<
typename
KeyT
,
typename
ValueT
>
struct
DictEntryTypeTraits
{
static
constexpr
int
TYPE
=
DBUS_TYPE_DICT_ENTRY
;
typedef
TemplateString
::
Concat
<
TemplateString
::
CharAsString
<
DBUS_DICT_ENTRY_BEGIN_CHAR
>
,
using
TypeAsString
=
TemplateString
::
Concat
<
TemplateString
::
CharAsString
<
DBUS_DICT_ENTRY_BEGIN_CHAR
>
,
typename
KeyT
::
TypeAsString
,
typename
ValueT
::
TypeAsString
,
TemplateString
::
CharAsString
<
DBUS_DICT_ENTRY_END_CHAR
>>
TypeAsString
;
TemplateString
::
CharAsString
<
DBUS_DICT_ENTRY_END_CHAR
>>
;
};
using
VariantTypeTraits
=
BasicTypeTraits
<
DBUS_TYPE_VARIANT
>
;
...
...
@@ -103,9 +106,10 @@ template<typename... ContainedTraits>
struct
StructTypeTraits
{
static
constexpr
int
TYPE
=
DBUS_TYPE_STRUCT
;
typedef
TemplateString
::
Concat
<
TemplateString
::
CharAsString
<
DBUS_STRUCT_BEGIN_CHAR
>
,
using
TypeAsString
=
TemplateString
::
Concat
<
TemplateString
::
CharAsString
<
DBUS_STRUCT_BEGIN_CHAR
>
,
ConcatTypeAsString
<
ContainedTraits
...
>
,
TemplateString
::
CharAsString
<
DBUS_STRUCT_END_CHAR
>>
TypeAsString
;
TemplateString
::
CharAsString
<
DBUS_STRUCT_END_CHAR
>>
;
};
}
/* namespace ODBus */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment