summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/memory_watcher/call_stack.cc4
-rw-r--r--tools/memory_watcher/memory_hook.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/memory_watcher/call_stack.cc b/tools/memory_watcher/call_stack.cc
index 93d941e..957ff69 100644
--- a/tools/memory_watcher/call_stack.cc
+++ b/tools/memory_watcher/call_stack.cc
@@ -35,7 +35,7 @@ typedef BOOL (__stdcall *t_SymGetModuleInfo64)(HANDLE, DWORD64,
PIMAGEHLP_MODULE64);
// static
-Lock CallStack::dbghelp_lock_;
+base:Lock CallStack::dbghelp_lock_;
// static
bool CallStack::dbghelp_loaded_ = false;
// static
@@ -373,7 +373,7 @@ void CallStack::ToString(PrivateAllocatorString* output) {
}
-Lock AllocationStack::freelist_lock_;
+base::Lock AllocationStack::freelist_lock_;
AllocationStack* AllocationStack::freelist_ = NULL;
void* AllocationStack::operator new(size_t size) {
diff --git a/tools/memory_watcher/memory_hook.cc b/tools/memory_watcher/memory_hook.cc
index 0c0a05d..b6ef00f 100644
--- a/tools/memory_watcher/memory_hook.cc
+++ b/tools/memory_watcher/memory_hook.cc
@@ -275,7 +275,7 @@ static BOOL WINAPI Perftools_VirtualFreeEx(HANDLE process, LPVOID address,
return patch_VirtualFreeEx()(process, address, size, type);
}
-static Lock known_maps_lock;
+static base::Lock known_maps_lock;
static std::map<void*, int> known_maps;
static LPVOID WINAPI Perftools_MapViewOfFileEx(HANDLE hFileMappingObject,