| Index: Source/platform/JSONValues.cpp
|
| diff --git a/Source/platform/JSONValues.cpp b/Source/platform/JSONValues.cpp
|
| index cd710890cac0b2066f2697b0a2d7656844ca9f7a..a3239e7f07b290bf6cd88bf5bb80ab840a6c099a 100644
|
| --- a/Source/platform/JSONValues.cpp
|
| +++ b/Source/platform/JSONValues.cpp
|
| @@ -265,7 +265,7 @@ JSONObjectBase::~JSONObjectBase()
|
|
|
| bool JSONObjectBase::asObject(RefPtr<JSONObject>* output)
|
| {
|
| - COMPILE_ASSERT(sizeof(JSONObject) == sizeof(JSONObjectBase), cannot_cast);
|
| + static_assert(sizeof(JSONObject) == sizeof(JSONObjectBase), "cannot cast");
|
| *output = static_cast<JSONObject*>(this);
|
| return true;
|
| }
|
| @@ -313,7 +313,7 @@ void JSONObjectBase::setArray(const String& name, PassRefPtr<JSONArray> value)
|
|
|
| JSONObject* JSONObjectBase::openAccessors()
|
| {
|
| - COMPILE_ASSERT(sizeof(JSONObject) == sizeof(JSONObjectBase), cannot_cast);
|
| + static_assert(sizeof(JSONObject) == sizeof(JSONObjectBase), "cannot cast");
|
| return static_cast<JSONObject*>(this);
|
| }
|
|
|
| @@ -424,14 +424,14 @@ JSONArrayBase::~JSONArrayBase()
|
|
|
| bool JSONArrayBase::asArray(RefPtr<JSONArray>* output)
|
| {
|
| - COMPILE_ASSERT(sizeof(JSONArrayBase) == sizeof(JSONArray), cannot_cast);
|
| + static_assert(sizeof(JSONArrayBase) == sizeof(JSONArray), "cannot cast");
|
| *output = static_cast<JSONArray*>(this);
|
| return true;
|
| }
|
|
|
| PassRefPtr<JSONArray> JSONArrayBase::asArray()
|
| {
|
| - COMPILE_ASSERT(sizeof(JSONArrayBase) == sizeof(JSONArray), cannot_cast);
|
| + static_assert(sizeof(JSONArrayBase) == sizeof(JSONArray), "cannot cast");
|
| return static_cast<JSONArray*>(this);
|
| }
|
|
|
|
|