Index: base/profiler/stack_sampling_profiler.cc |
diff --git a/base/profiler/stack_sampling_profiler.cc b/base/profiler/stack_sampling_profiler.cc |
index 00a79b55bd7fd465f423fa3202bb48661d26e96a..025dbbd5778820dec14df4d1272844f9bb8b8d35 100644 |
--- a/base/profiler/stack_sampling_profiler.cc |
+++ b/base/profiler/stack_sampling_profiler.cc |
@@ -83,8 +83,9 @@ void AsyncRunner::RunCallbackAndDeleteInstance( |
// StackSamplingProfiler::Module ---------------------------------------------- |
-StackSamplingProfiler::Module::Module() : base_address(nullptr) {} |
-StackSamplingProfiler::Module::Module(const void* base_address, |
+StackSamplingProfiler::Module::Module() |
+ : base_address(reinterpret_cast<uintptr_t>(nullptr)) {} |
Mike Wittman
2015/09/01 01:42:15
nit: just base_address(0u)
sydli
2015/09/03 16:21:15
Done.
|
+StackSamplingProfiler::Module::Module(const uintptr_t base_address, |
const std::string& id, |
const FilePath& filename) |
: base_address(base_address), id(id), filename(filename) {} |
@@ -93,13 +94,15 @@ StackSamplingProfiler::Module::~Module() {} |
// StackSamplingProfiler::Frame ----------------------------------------------- |
-StackSamplingProfiler::Frame::Frame(const void* instruction_pointer, |
+StackSamplingProfiler::Frame::Frame(uintptr_t instruction_pointer, |
size_t module_index) |
: instruction_pointer(instruction_pointer), |
module_index(module_index) {} |
StackSamplingProfiler::Frame::~Frame() {} |
+StackSamplingProfiler::Frame::Frame() {} |
+ |
// StackSamplingProfiler::CallStackProfile ------------------------------------ |
StackSamplingProfiler::CallStackProfile::CallStackProfile() {} |