diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 12:07:37 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-24 12:07:37 +0000 |
| commit | 0f3eaca32c31fdbacbedb6638c43984c11fcd191 (patch) | |
| tree | 32ec0c611c25a1508b48e973a552f8df52dd9b77 /third_party/tcmalloc/chromium/src/google/tcmalloc.h.in | |
| parent | f6c3483efa3d0cb4a7f49c2e3fc563100722e21b (diff) | |
| download | chromium_src-0f3eaca32c31fdbacbedb6638c43984c11fcd191.zip chromium_src-0f3eaca32c31fdbacbedb6638c43984c11fcd191.tar.gz chromium_src-0f3eaca32c31fdbacbedb6638c43984c11fcd191.tar.bz2 | |
Revert 48024 - Reland http://codereview.chromium.org/1735024/show to assess the performance.
Review URL: http://codereview.chromium.org/2164001
TBR=antonm,willchan
Review URL: http://codereview.chromium.org/2155002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc/chromium/src/google/tcmalloc.h.in')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/google/tcmalloc.h.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/third_party/tcmalloc/chromium/src/google/tcmalloc.h.in b/third_party/tcmalloc/chromium/src/google/tcmalloc.h.in index fbb70ab..e5c873d 100644 --- a/third_party/tcmalloc/chromium/src/google/tcmalloc.h.in +++ b/third_party/tcmalloc/chromium/src/google/tcmalloc.h.in @@ -60,8 +60,7 @@ #endif #ifdef __cplusplus -#include <new> // for std::nothrow_t - +#include <new> // for nothrow_t extern "C" { #endif // Returns a human-readable version string. If major, minor, @@ -92,15 +91,16 @@ extern "C" { #ifdef __cplusplus PERFTOOLS_DLL_DECL int tc_set_new_mode(int flag) __THROW; PERFTOOLS_DLL_DECL void* tc_new(size_t size); - PERFTOOLS_DLL_DECL void* tc_new_nothrow(size_t size, - const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void tc_delete(void* p) __THROW; - PERFTOOLS_DLL_DECL void tc_delete_nothrow(void* p, - const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void* tc_newarray(size_t size); + PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW; + + PERFTOOLS_DLL_DECL void* tc_new_nothrow(size_t size, + const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size, const std::nothrow_t&) __THROW; - PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW; + PERFTOOLS_DLL_DECL void tc_delete_nothrow(void* p, + const std::nothrow_t&) __THROW; PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p, const std::nothrow_t&) __THROW; } |