Ignore:
Timestamp:
May 21, 2008, 6:20:45 PM (17 years ago)
Author:
[email protected]
Message:

Merge squirrelfish branch into trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/kjs/date_object.h

    r31943 r33979  
    128128    class DateObjectImp : public InternalFunctionImp {
    129129    public:
    130         DateObjectImp(ExecState *, FunctionPrototype *, DatePrototype *);
     130        DateObjectImp(ExecState*, FunctionPrototype*, DatePrototype*);
    131131
    132         virtual bool implementsConstruct() const;
    133         virtual JSObject *construct(ExecState *, const List &args);
    134         virtual JSValue *callAsFunction(ExecState *, JSObject *thisObj, const List &args);
     132        virtual ConstructType getConstructData(ConstructData&);
     133        virtual JSObject* construct(ExecState*, const List& args);
    135134
    136         JSObject *construct(const List &);
     135        virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const List& args);
     136
     137        JSObject* construct(const List&);
    137138    };
    138139
Note: See TracChangeset for help on using the changeset viewer.