From 3e88efa62aef71181d33d42ae3c15c0d45c0bc6c Mon Sep 17 00:00:00 2001
From: Krzysztof Jackiewicz <k.jackiewicz@samsung.com>
Date: Wed, 8 Aug 2018 11:27:10 +0200
Subject: Simplify array size calculation

Change-Id: I8d5af79702a1b4b2e61813b99a246fbbac559320
---
 src/common/privilege_db.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/common/privilege_db.cpp b/src/common/privilege_db.cpp
index 8599204e..530fafbe 100644
--- a/src/common/privilege_db.cpp
+++ b/src/common/privilege_db.cpp
@@ -45,15 +45,11 @@
 namespace SecurityManager {
 namespace {
 
-namespace detail {
 template <class T, size_t S>
-uint8_t(&arraySizeHelper(T (&)[S]))[S];
-
-template <class T, size_t S>
-uint8_t(&arraySizeHelper(std::array<T, S> const &))[S];
-} //namespace detail
-
-#define arraySize(A) (sizeof(detail::arraySizeHelper((A))))
+constexpr size_t arraySize(T (&)[S])
+{
+    return S;
+}
 
 constexpr const char *g_queries[StmtTypeCount] = {
     [int(StmtType::EAddApplication)] = "INSERT INTO user_app_pkg_view (app_name, pkg_name, uid, version, author_name, is_hybrid)"
-- 
cgit v1.2.3