Enable static asserts for enumerated values

Bug: http://107.108.218.239/bugzilla/show_bug.cgi?id=10791
Reviewed by: Laszlo Gombos, Piotr Grad, Piotr Tworek

Change-Id: Idb53a8ffb7ca8a3fcec30b2380a91cb3f9ef42a7
Signed-off-by: Tomasz Czekala <t.czekala@partner.samsung.com>

diff --git a/tizen_src/ewk/efl_integration/private/api_static_check.cc b/tizen_src/ewk/efl_integration/private/api_static_check.cc
index 3ae5639..24e23b4 100644 (file)
--- a/tizen_src/ewk/efl_integration/private/api_static_check.cc
+++ b/tizen_src/ewk/efl_integration/private/api_static_check.cc
@@ -2,30 +2,35 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#if !defined(EWK_BRINGUP)
-
 #include "public/ewk_view.h"
 #include "public/ewk_cookie_manager.h"
-#include "tizen_webview/public/tw_unfocus_direction.h"
+#include "tizen_webview/public/tw_callbacks.h"
 #include "tizen_webview/public/tw_cookie_accept_policy.h"
 
-template <bool> class StaticAssert;
-template <> class StaticAssert<true> { };
-
-#define STATIC_ASSERT(condition, message) \
-    { StaticAssert<((condition) != 0)> ERROR_##message; (void)ERROR_##message; }
-
 #define STATIC_ENUM_IS_EQUAL(left, right) \
-    STATIC_ASSERT(static_cast<int>(left) == static_cast<int>(right), _ENUM_VALUE_MISMATCH)
-
-void do_static_check()
-{
-  STATIC_ENUM_IS_EQUAL(tizen_webview::TW_UNFOCUS_DIRECTION_FORWARD, EWK_UNFOCUS_DIRECTION_FORWARD);
-  STATIC_ENUM_IS_EQUAL(tizen_webview::TW_UNFOCUS_DIRECTION_BACKWARD, EWK_UNFOCUS_DIRECTION_BACKWARD);
-
-  STATIC_ENUM_IS_EQUAL(EWK_COOKIE_ACCEPT_POLICY_ALWAYS, tizen_webview::TW_COOKIE_ACCEPT_POLICY_ALWAYS);
-  STATIC_ENUM_IS_EQUAL(EWK_COOKIE_ACCEPT_POLICY_NEVER, tizen_webview::TW_COOKIE_ACCEPT_POLICY_NEVER);
-  STATIC_ENUM_IS_EQUAL(EWK_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY, tizen_webview::TW_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY);
+    static_assert(static_cast<int>(left) == static_cast<int>(right), \
+    "Enum values mismatch")
+
+void do_static_check() {
+  STATIC_ENUM_IS_EQUAL(tizen_webview::UNFOCUS_DIRECTION_NONE,
+                       EWK_UNFOCUS_DIRECTION_NONE);
+  STATIC_ENUM_IS_EQUAL(tizen_webview::UNFOCUS_DIRECTION_FORWARD,
+                       EWK_UNFOCUS_DIRECTION_FORWARD);
+  STATIC_ENUM_IS_EQUAL(tizen_webview::UNFOCUS_DIRECTION_BACKWARD,
+                       EWK_UNFOCUS_DIRECTION_BACKWARD);
+  STATIC_ENUM_IS_EQUAL(tizen_webview::UNFOCUS_DIRECTION_UP,
+                       EWK_UNFOCUS_DIRECTION_UP);
+  STATIC_ENUM_IS_EQUAL(tizen_webview::UNFOCUS_DIRECTION_DOWN,
+                       EWK_UNFOCUS_DIRECTION_DOWN);
+  STATIC_ENUM_IS_EQUAL(tizen_webview::UNFOCUS_DIRECTION_LEFT,
+                       EWK_UNFOCUS_DIRECTION_LEFT);
+  STATIC_ENUM_IS_EQUAL(tizen_webview::UNFOCUS_DIRECTION_RIGHT,
+                       EWK_UNFOCUS_DIRECTION_RIGHT);
+
+  STATIC_ENUM_IS_EQUAL(EWK_COOKIE_ACCEPT_POLICY_ALWAYS,
+                       tizen_webview::TW_COOKIE_ACCEPT_POLICY_ALWAYS);
+  STATIC_ENUM_IS_EQUAL(EWK_COOKIE_ACCEPT_POLICY_NEVER,
+                       tizen_webview::TW_COOKIE_ACCEPT_POLICY_NEVER);
+  STATIC_ENUM_IS_EQUAL(EWK_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY,
+                       tizen_webview::TW_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY);
 }
-#endif
-