Show
Ignore:
Timestamp:
08/20/08 13:23:52 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35853

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/VM/JSPropertyNameIterator.cpp

    r440 r447  
    6464} 
    6565 
    66 JSType JSPropertyNameIterator::type() const 
    67 
    68     return UnspecifiedType; 
    69 
    70  
    71 JSValue* JSPropertyNameIterator::toPrimitive(ExecState*, JSType) const 
     66JSValue* JSPropertyNameIterator::toPrimitive(ExecState*, PreferredPrimitiveType) const 
    7267{ 
    7368    ASSERT_NOT_REACHED();