Show
Ignore:
Timestamp:
08/13/08 13:49:09 (5 months ago)
Author:
odole
Message:

merge with webkit revision 35706

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/JavaScriptCore/wtf/FastMalloc.h

    r387 r436  
    2828namespace WTF { 
    2929 
    30     void *fastMalloc(size_t n); 
    31     void *fastZeroedMalloc(size_t n); 
    32     void *fastCalloc(size_t n_elements, size_t element_size); 
     30    // These functions call abort() if an allocation fails. 
     31    void* fastMalloc(size_t n); 
     32    void* fastZeroedMalloc(size_t n); 
     33    void* fastCalloc(size_t n_elements, size_t element_size); 
     34    void* fastRealloc(void* p, size_t n); 
     35 
     36    // These functions return NULL if an allocation fails. 
     37    void* tryFastMalloc(size_t n); 
     38    void* tryFastZeroedMalloc(size_t n); 
     39    void* tryFastCalloc(size_t n_elements, size_t element_size); 
     40    void* tryFastRealloc(void* p, size_t n); 
     41 
    3342    void fastFree(void* p); 
    34     void *fastRealloc(void* p, size_t n); 
    3543 
    3644#ifndef NDEBUG     
     
    4755using WTF::fastCalloc; 
    4856using WTF::fastRealloc; 
     57using WTF::tryFastMalloc; 
     58using WTF::tryFastZeroedMalloc; 
     59using WTF::tryFastCalloc; 
     60using WTF::tryFastRealloc; 
    4961using WTF::fastFree; 
    5062