Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h.in

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebasec Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* Copyright (c) 2003, Google Inc. 1 /* Copyright (c) 2003, Google Inc.
2 * All rights reserved. 2 * All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 // "This function will never throw an exception." It's an optional 44 // "This function will never throw an exception." It's an optional
45 // optimization tool, but we may need to use it to match glibc prototypes. 45 // optimization tool, but we may need to use it to match glibc prototypes.
46 #ifndef __THROW /* I guess we're not on a glibc system */ 46 #ifndef __THROW /* I guess we're not on a glibc system */
47 # define __THROW /* __THROW is just an optimization, so ok to make it "" */ 47 # define __THROW /* __THROW is just an optimization, so ok to make it "" */
48 #endif 48 #endif
49 49
50 // Define the version number so folks can check against it 50 // Define the version number so folks can check against it
51 #define TC_VERSION_MAJOR @TC_VERSION_MAJOR@ 51 #define TC_VERSION_MAJOR @TC_VERSION_MAJOR@
52 #define TC_VERSION_MINOR @TC_VERSION_MINOR@ 52 #define TC_VERSION_MINOR @TC_VERSION_MINOR@
53 #define TC_VERSION_PATCH "@TC_VERSION_PATCH@" 53 #define TC_VERSION_PATCH "@TC_VERSION_PATCH@"
54 #define TC_VERSION_STRING "google-perftools @TC_VERSION_MAJOR@.@TC_VERSION_MINOR @@TC_VERSION_PATCH@" 54 #define TC_VERSION_STRING "gperftools @TC_VERSION_MAJOR@.@TC_VERSION_MINOR@@TC_V ERSION_PATCH@"
55 55
56 #include <stdlib.h> // for struct mallinfo, if it's defined 56 #include <stdlib.h> // for struct mallinfo, if it's defined
57 57
58 // Annoying stuff for windows -- makes sure clients can import these functions 58 // Annoying stuff for windows -- makes sure clients can import these functions
59 #ifndef PERFTOOLS_DLL_DECL 59 #ifndef PERFTOOLS_DLL_DECL
60 # ifdef _WIN32 60 # ifdef _WIN32
61 # define PERFTOOLS_DLL_DECL __declspec(dllimport) 61 # define PERFTOOLS_DLL_DECL __declspec(dllimport)
62 # else 62 # else
63 # define PERFTOOLS_DLL_DECL 63 # define PERFTOOLS_DLL_DECL
64 # endif 64 # endif
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 PERFTOOLS_DLL_DECL void* tc_newarray(size_t size); 114 PERFTOOLS_DLL_DECL void* tc_newarray(size_t size);
115 PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size, 115 PERFTOOLS_DLL_DECL void* tc_newarray_nothrow(size_t size,
116 const std::nothrow_t&) __THROW; 116 const std::nothrow_t&) __THROW;
117 PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW; 117 PERFTOOLS_DLL_DECL void tc_deletearray(void* p) __THROW;
118 PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p, 118 PERFTOOLS_DLL_DECL void tc_deletearray_nothrow(void* p,
119 const std::nothrow_t&) __THROW; 119 const std::nothrow_t&) __THROW;
120 } 120 }
121 #endif 121 #endif
122 122
123 #endif // #ifndef TCMALLOC_TCMALLOC_H_ 123 #endif // #ifndef TCMALLOC_TCMALLOC_H_
OLDNEW
« no previous file with comments | « third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h ('k') | third_party/tcmalloc/chromium/src/heap-checker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698