• thakis@chromium.org's avatar
    Follow-up for https://codereview.chromium.org/419323002/ · 01b79894
    thakis@chromium.org authored
    operator delete apparently isn't throw() with msvs (at least in
    _HAS_EXCEPTIONS=0 builds like ours). This fixes the two remaining
    warnings in this file:
    
    ..\..\base\allocator/generic_allocators.cc(31,6) :  warning(clang): function previously declared with an implicit exception specification redeclared with an explicit exception specification [-Wimplicit-exception-spec-mismatch]
    void operator delete(void* p) throw() {
         ^
    E:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\new(52,16) :  note(clang): previous declaration is here
    void __CRTDECL operator delete(void *) _THROW0();
                   ^
    In file included from ..\..\base\allocator\allocator_shim.cc:334:
    ..\..\base\allocator/generic_allocators.cc(39,6) :  warning(clang): function previously declared with an implicit exception specification redeclared with an explicit exception specification [-Wimplicit-exception-spec-mismatch]
    void operator delete[](void* p) throw() {
         ^
    E:\b\depot_tools\win_toolchain\vs2013_files\win8sdk\bin\..\..\VC\include\crtdbg.h(1054,16) :  note(clang): previous declaration is here
    void __CRTDECL operator delete[](void *);
                   ^
    2 warnings generated.
    
    There also wasn't a std::nothrow overload for delete, so add that for
    completeness while here. (For C++14, we might have to add sized
    overloads too at some point.)
    
    BUG=82385
    NOTRY=true
    
    Review URL: https://codereview.chromium.org/447513002
    
    git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288129 0039d316-1c4b-4281-b951-d872f2087c98
    01b79894
generic_allocators.cc 3.91 KB