Simplify array size calculation

Change-Id: I8d5af79702a1b4b2e61813b99a246fbbac559320

diff --git a/src/common/privilege_db.cpp b/src/common/privilege_db.cpp
index 8599204e13b627f93b76cdc5b5be321decc69fa7..530fafbed86a7deb167c9f62e92872e1fa47b180 100644 (file)
--- 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)"