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..707a6bbcc3c90734b18c88bcb0cbbea4dbc540c8 100644 |
--- a/base/profiler/stack_sampling_profiler.cc |
+++ b/base/profiler/stack_sampling_profiler.cc |
@@ -83,19 +83,24 @@ void AsyncRunner::RunCallbackAndDeleteInstance( |
// StackSamplingProfiler::Module ---------------------------------------------- |
-StackSamplingProfiler::Module::Module() : base_address(nullptr) {} |
+StackSamplingProfiler::Module::Module() |
+ : base_address(reinterpret_cast<uintptr_t>(nullptr)) {} |
StackSamplingProfiler::Module::Module(const void* base_address, |
const std::string& id, |
const FilePath& filename) |
- : base_address(base_address), id(id), filename(filename) {} |
+ : base_address(reinterpret_cast<uintptr_t>(base_address)), |
+ id(id), |
+ filename(filename) {} |
StackSamplingProfiler::Module::~Module() {} |
// StackSamplingProfiler::Frame ----------------------------------------------- |
+StackSamplingProfiler::Frame::Frame() |
+ : instruction_pointer(reinterpret_cast<uintptr_t>(nullptr)) {} |
StackSamplingProfiler::Frame::Frame(const void* instruction_pointer, |
size_t module_index) |
- : instruction_pointer(instruction_pointer), |
+ : instruction_pointer(reinterpret_cast<uintptr_t>(instruction_pointer)), |
module_index(module_index) {} |
StackSamplingProfiler::Frame::~Frame() {} |