Index: third_party/tcmalloc/vendor/src/base/googleinit.h |
=================================================================== |
--- third_party/tcmalloc/vendor/src/base/googleinit.h (revision 126727) |
+++ third_party/tcmalloc/vendor/src/base/googleinit.h (working copy) |
@@ -33,41 +33,19 @@ |
#ifndef _GOOGLEINIT_H |
#define _GOOGLEINIT_H |
-#include "base/logging.h" |
- |
class GoogleInitializer { |
public: |
- typedef void (*VoidFunction)(void); |
- GoogleInitializer(const char* name, VoidFunction ctor, VoidFunction dtor) |
- : name_(name), destructor_(dtor) { |
- RAW_VLOG(10, "<GoogleModuleObject> constructing: %s\n", name_); |
- if (ctor) |
- ctor(); |
+ typedef void (*void_function)(void); |
+ GoogleInitializer(const char* name, void_function f) { |
+ f(); |
} |
- ~GoogleInitializer() { |
- RAW_VLOG(10, "<GoogleModuleObject> destroying: %s\n", name_); |
- if (destructor_) |
- destructor_(); |
- } |
- |
- private: |
- const char* const name_; |
- const VoidFunction destructor_; |
}; |
#define REGISTER_MODULE_INITIALIZER(name, body) \ |
namespace { \ |
static void google_init_module_##name () { body; } \ |
GoogleInitializer google_initializer_module_##name(#name, \ |
- google_init_module_##name, NULL); \ |
+ google_init_module_##name); \ |
} |
-#define REGISTER_MODULE_DESTRUCTOR(name, body) \ |
- namespace { \ |
- static void google_destruct_module_##name () { body; } \ |
- GoogleInitializer google_destructor_module_##name(#name, \ |
- NULL, google_destruct_module_##name); \ |
- } |
- |
- |
#endif /* _GOOGLEINIT_H */ |