From 874dc5592a9d627e8f724cffce5ba37d1165822f Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Sat, 6 May 2017 22:03:52 -0400
Subject: [PATCH] style: help clang-format near macros
Function-like macro invocations not followed by semicolons confuse
clang-format. Help it out with some markup.
---
CommandLineArguments.cxx | 52 +++++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 24 deletions(-)
diff --git a/CommandLineArguments.cxx b/CommandLineArguments.cxx
index 7684aad..5613bd7 100644
--- a/CommandLineArguments.cxx
+++ b/CommandLineArguments.cxx
@@ -374,20 +374,23 @@ void CommandLineArguments::AddArgument(const char* argument,
variable, help); \
}
+/* clang-format off */
CommandLineArgumentsAddArgumentMacro(BOOL, bool)
- CommandLineArgumentsAddArgumentMacro(INT, int)
- CommandLineArgumentsAddArgumentMacro(DOUBLE, double)
- CommandLineArgumentsAddArgumentMacro(STRING, char*)
- CommandLineArgumentsAddArgumentMacro(STL_STRING, std::string)
-
- CommandLineArgumentsAddArgumentMacro(VECTOR_BOOL, std::vector<bool>)
- CommandLineArgumentsAddArgumentMacro(VECTOR_INT, std::vector<int>)
- CommandLineArgumentsAddArgumentMacro(VECTOR_DOUBLE,
- std::vector<double>)
- CommandLineArgumentsAddArgumentMacro(VECTOR_STRING,
- std::vector<char*>)
- CommandLineArgumentsAddArgumentMacro(
- VECTOR_STL_STRING, std::vector<std::string>)
+CommandLineArgumentsAddArgumentMacro(INT, int)
+CommandLineArgumentsAddArgumentMacro(DOUBLE, double)
+CommandLineArgumentsAddArgumentMacro(STRING, char*)
+CommandLineArgumentsAddArgumentMacro(STL_STRING, std::string)
+
+CommandLineArgumentsAddArgumentMacro(VECTOR_BOOL, std::vector<bool>)
+CommandLineArgumentsAddArgumentMacro(VECTOR_INT, std::vector<int>)
+CommandLineArgumentsAddArgumentMacro(VECTOR_DOUBLE, std::vector<double>)
+CommandLineArgumentsAddArgumentMacro(VECTOR_STRING, std::vector<char*>)
+CommandLineArgumentsAddArgumentMacro(VECTOR_STL_STRING,
+ std::vector<std::string>)
+#ifdef HELP_CLANG_FORMAT
+;
+#endif
+/* clang-format on */
#define CommandLineArgumentsAddBooleanArgumentMacro(type, ctype) \
void CommandLineArguments::AddBooleanArgument( \
@@ -397,17 +400,18 @@ CommandLineArgumentsAddArgumentMacro(BOOL, bool)
CommandLineArguments::type##_TYPE, variable, help); \
}
- CommandLineArgumentsAddBooleanArgumentMacro(BOOL, bool)
- CommandLineArgumentsAddBooleanArgumentMacro(INT, int)
- CommandLineArgumentsAddBooleanArgumentMacro(DOUBLE,
- double)
- CommandLineArgumentsAddBooleanArgumentMacro(STRING,
- char*)
- CommandLineArgumentsAddBooleanArgumentMacro(
- STL_STRING, std::string)
-
- void CommandLineArguments::SetClientData(
- void* client_data)
+/* clang-format off */
+CommandLineArgumentsAddBooleanArgumentMacro(BOOL, bool)
+CommandLineArgumentsAddBooleanArgumentMacro(INT, int)
+CommandLineArgumentsAddBooleanArgumentMacro(DOUBLE, double)
+CommandLineArgumentsAddBooleanArgumentMacro(STRING, char*)
+CommandLineArgumentsAddBooleanArgumentMacro(STL_STRING, std::string)
+#ifdef HELP_CLANG_FORMAT
+;
+#endif
+/* clang-format on */
+
+void CommandLineArguments::SetClientData(void* client_data)
{
this->Internals->ClientData = client_data;
}
--
GitLab