| Index: ppapi/shared_impl/ppb_gamepad_shared.cc
|
| diff --git a/ppapi/shared_impl/ppb_gamepad_shared.cc b/ppapi/shared_impl/ppb_gamepad_shared.cc
|
| index 2358e87349cd562cd46c28781c9a0dc8b2334cdf..7aa752a8aab561a2d8eba127baed419c77e5ed5d 100644
|
| --- a/ppapi/shared_impl/ppb_gamepad_shared.cc
|
| +++ b/ppapi/shared_impl/ppb_gamepad_shared.cc
|
| @@ -16,8 +16,8 @@ void ConvertWebKitGamepadData(const WebKitGamepads& webkit_data,
|
| const WebKitGamepad& webkit_pad = webkit_data.items[i];
|
| output_pad.connected = webkit_pad.connected ? PP_TRUE : PP_FALSE;
|
| if (webkit_pad.connected) {
|
| - COMPILE_ASSERT(sizeof(output_pad.id) == sizeof(webkit_pad.id),
|
| - id_size_does_not_match);
|
| + static_assert(sizeof(output_pad.id) == sizeof(webkit_pad.id),
|
| + "id size does not match");
|
| memcpy(output_pad.id, webkit_pad.id, sizeof(output_pad.id));
|
| output_pad.timestamp = static_cast<double>(webkit_pad.timestamp);
|
| output_pad.axes_length = webkit_pad.axes_length;
|
|
|