Index: ppapi/thunk/ppb_text_input_thunk.cc |
diff --git a/ppapi/thunk/ppb_text_input_thunk.cc b/ppapi/thunk/ppb_text_input_thunk.cc |
index a59146bd1f7b98ed18896231d7697af696087b06..06c9cd671f3ef725a2df8424cb93685f6dcc98a9 100644 |
--- a/ppapi/thunk/ppb_text_input_thunk.cc |
+++ b/ppapi/thunk/ppb_text_input_thunk.cc |
@@ -15,26 +15,18 @@ namespace thunk { |
namespace { |
-COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_NONE) == int(PP_TEXTINPUT_TYPE_NONE), |
- mismatching_enums); |
-COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_TEXT) == int(PP_TEXTINPUT_TYPE_TEXT), |
- mismatching_enums); |
-COMPILE_ASSERT( |
- int(PP_TEXTINPUT_TYPE_DEV_PASSWORD) == int(PP_TEXTINPUT_TYPE_PASSWORD), |
- mismatching_enums); |
-COMPILE_ASSERT( |
- int(PP_TEXTINPUT_TYPE_DEV_SEARCH) == int(PP_TEXTINPUT_TYPE_SEARCH), |
- mismatching_enums); |
-COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_EMAIL) == int(PP_TEXTINPUT_TYPE_EMAIL), |
- mismatching_enums); |
-COMPILE_ASSERT( |
- int(PP_TEXTINPUT_TYPE_DEV_NUMBER) == int(PP_TEXTINPUT_TYPE_NUMBER), |
- mismatching_enums); |
-COMPILE_ASSERT( |
- int(PP_TEXTINPUT_TYPE_DEV_TELEPHONE) == int(PP_TEXTINPUT_TYPE_TELEPHONE), |
- mismatching_enums); |
-COMPILE_ASSERT(int(PP_TEXTINPUT_TYPE_DEV_URL) == int(PP_TEXTINPUT_TYPE_URL), |
- mismatching_enums); |
+#define STATIC_ASSERT_ENUM(a, b) \ |
+ static_assert(int(a) == int(b), "mismatching enum values: " #a) |
+ |
+STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_NONE, PP_TEXTINPUT_TYPE_NONE); |
+STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_TEXT, PP_TEXTINPUT_TYPE_TEXT); |
+STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_PASSWORD, PP_TEXTINPUT_TYPE_PASSWORD); |
+STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_SEARCH, PP_TEXTINPUT_TYPE_SEARCH); |
+STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_EMAIL, PP_TEXTINPUT_TYPE_EMAIL); |
+STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_NUMBER, PP_TEXTINPUT_TYPE_NUMBER); |
+STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_TELEPHONE, |
+ PP_TEXTINPUT_TYPE_TELEPHONE); |
+STATIC_ASSERT_ENUM(PP_TEXTINPUT_TYPE_DEV_URL, PP_TEXTINPUT_TYPE_URL); |
void SetTextInputType(PP_Instance instance, PP_TextInput_Type type) { |
EnterInstance enter(instance); |