| Index: Source/wtf/TypeTraits.h
|
| diff --git a/Source/wtf/TypeTraits.h b/Source/wtf/TypeTraits.h
|
| index 586e943a642ee9f9a8e2505cece8fdcfe3f7ac78..d015b475a2786a78e62b99bca6dbf5c1e5b6ebef 100644
|
| --- a/Source/wtf/TypeTraits.h
|
| +++ b/Source/wtf/TypeTraits.h
|
| @@ -291,17 +291,17 @@ namespace WTF {
|
|
|
| } // namespace WTF
|
|
|
| -namespace WebCore {
|
| +namespace blink {
|
|
|
| class JSONValue;
|
|
|
| -} // namespace WebCore
|
| +} // namespace blink
|
|
|
| namespace WTF {
|
|
|
| // FIXME: Disable pointer conversion checking against JSONValue.
|
| // The current CodeGeneratorInspector.py generates code which upcasts to JSONValue from undefined types.
|
| - template<typename From> class IsPointerConvertible<From, WebCore::JSONValue> {
|
| + template<typename From> class IsPointerConvertible<From, blink::JSONValue> {
|
| public:
|
| enum {
|
| Value = true
|
|
|