From 234f8d287aa1be8de4b0554f40beb12aa0c8f912 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Sun, 3 Jun 2018 20:26:30 +0200
Subject: [PATCH] lib/dbus/Types: rename _MakeStructTypeAsString to
 ConcatTypeAsString

---
 src/lib/dbus/Types.hxx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/lib/dbus/Types.hxx b/src/lib/dbus/Types.hxx
index f3bcae6b8..2181cccfe 100644
--- a/src/lib/dbus/Types.hxx
+++ b/src/lib/dbus/Types.hxx
@@ -81,20 +81,23 @@ struct DictEntryTypeTraits {
 
 using VariantTypeTraits = BasicTypeTraits<DBUS_TYPE_VARIANT>;
 
+/**
+ * Concatenate all TypeAsString members to one string.
+ */
 template<typename T, typename... ContainedTraits>
-struct _MakeStructTypeAsString
+struct ConcatTypeAsString
 	: TemplateString::Concat<typename T::TypeAsString,
-				 _MakeStructTypeAsString<ContainedTraits...>> {};
+				 ConcatTypeAsString<ContainedTraits...>> {};
 
 template<typename T>
-struct _MakeStructTypeAsString<T> : T::TypeAsString {};
+struct ConcatTypeAsString<T> : T::TypeAsString {};
 
 template<typename... ContainedTraits>
 struct StructTypeTraits {
 	static constexpr int TYPE = DBUS_TYPE_STRUCT;
 
 	typedef TemplateString::Concat<TemplateString::CharAsString<DBUS_STRUCT_BEGIN_CHAR>,
-				       _MakeStructTypeAsString<ContainedTraits...>,
+				       ConcatTypeAsString<ContainedTraits...>,
 				       TemplateString::CharAsString<DBUS_STRUCT_END_CHAR>> TypeAsString;
 };