From 1cbfe4e499e0f089527fe7e8d1ffeb91c89cc0b0 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Mon, 21 May 2018 14:49:01 +0200
Subject: [PATCH] fix(MainDb): SqlEventFilterBuilder => better code

---
 include/linphone/utils/static-string.h |  2 +-
 src/db/main-db.cpp                     | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/linphone/utils/static-string.h b/include/linphone/utils/static-string.h
index bbc421e06..44f31a847 100644
--- a/include/linphone/utils/static-string.h
+++ b/include/linphone/utils/static-string.h
@@ -120,7 +120,7 @@ namespace Private {
 			raw{ char('0' + Value / pow10(N - Index - 2) % 10)..., '\0' } {}
 
 		template<std::size_t... Index, typename Int = int, typename std::enable_if<IsNeg::value, Int>::type* = nullptr>
-		constexpr StaticIntStringHelper(const IndexSequence<Index...> &) :
+		constexpr StaticIntStringHelper (const IndexSequence<Index...> &) :
 			raw{ '-', char('0' + abs(Value) / pow10(N - Index - 3) % 10)..., '\0' } {}
 	};
 };
diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index f96a6e14d..a928cf085 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -138,16 +138,14 @@ struct SqlEventFilterBuilder {};
 
 template<EventLog::Type Type, EventLog::Type... List>
 struct SqlEventFilterBuilder<Type, List...> {
-	static constexpr Private::StaticString<1 + getIntLength(int(Type)) + sums((1 + getIntLength(int(List)))...)> get () {
-		return StaticIntString<int(Type)>() + "," + SqlEventFilterBuilder<List...>::get();
-	}
+	static constexpr auto get () L_AUTO_RETURN(
+		StaticIntString<int(Type)>() + "," + SqlEventFilterBuilder<List...>::get()
+	);
 };
 
 template<EventLog::Type Type>
 struct SqlEventFilterBuilder<Type> {
-	static constexpr Private::StaticString<1 + getIntLength(int(Type))> get () {
-		return StaticIntString<int(Type)>();
-	}
+	static constexpr auto get () L_AUTO_RETURN(StaticIntString<int(Type)>());
 };
 
 // -----------------------------------------------------------------------------