From 528c56de01bbbd38788ed6cf8d2eea4c56cbe19e Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Fri, 30 Jul 2010 19:28:44 +0000 Subject: Move the number conversions from string_util to a new file. Use the base namespace in the new file. Update callers. I removed all wstring variants and also the string->number ones that ignore the return value. That encourages people to write code and forget about error handling. TEST=included unit tests BUG=none Review URL: http://codereview.chromium.org/3056029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54355 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/memory_watcher/call_stack.cc | 11 ++++++----- tools/memory_watcher/call_stack.h | 8 ++++---- tools/memory_watcher/memory_watcher.h | 7 ++++--- 3 files changed, 14 insertions(+), 12 deletions(-) (limited to 'tools/memory_watcher') diff --git a/tools/memory_watcher/call_stack.cc b/tools/memory_watcher/call_stack.cc index 460695d..15ca917 100644 --- a/tools/memory_watcher/call_stack.cc +++ b/tools/memory_watcher/call_stack.cc @@ -1,13 +1,14 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "call_stack.h" +#include "tools/memory_watcher/call_stack.h" + #include #include -#include "memory_hook.h" -#include "base/string_util.h" +#include "base/string_number_conversions.h" +#include "tools/memory_watcher/memory_hook.h" // Typedefs for explicit dynamic linking with functions exported from // dbghelp.dll. @@ -341,7 +342,7 @@ void CallStack::ToString(PrivateAllocatorString* output) { // TODO(jar): get something like this template to work :-/ // line += IntToCustomString(Line.LineNumber); // ...and then delete this line, which uses std::string. - line += IntToString(Line.LineNumber).c_str(); + line += base::IntToString(Line.LineNumber).c_str(); line += "): "; line += symbol->Name; line += "\n"; diff --git a/tools/memory_watcher/call_stack.h b/tools/memory_watcher/call_stack.h index 264ad901..12a0114 100644 --- a/tools/memory_watcher/call_stack.h +++ b/tools/memory_watcher/call_stack.h @@ -8,8 +8,8 @@ // http://www.codeproject.com/KB/threads/StackWalker.aspx // by Jochen Kalmbach -#ifndef MEMORY_WATCHER_CALL_STACK_H_ -#define MEMORY_WATCHER_CALL_STACK_H_ +#ifndef TOOLS_MEMORY_WATCHER_CALL_STACK_H_ +#define TOOLS_MEMORY_WATCHER_CALL_STACK_H_ #include #include @@ -17,9 +17,9 @@ #include #include -#include "memory_watcher.h" #include "base/lock.h" #include "base/logging.h" +#include "tools/memory_watcher/memory_watcher.h" // The CallStack Class // A stack where memory has been allocated. @@ -165,4 +165,4 @@ class AllocationStack : public CallStack { DISALLOW_COPY_AND_ASSIGN(AllocationStack); }; -#endif // MEMORY_WATCHER_CALL_STACK_H_ +#endif // TOOLS_MEMORY_WATCHER_CALL_STACK_H_ diff --git a/tools/memory_watcher/memory_watcher.h b/tools/memory_watcher/memory_watcher.h index 9609ce2..8cee2b80 100644 --- a/tools/memory_watcher/memory_watcher.h +++ b/tools/memory_watcher/memory_watcher.h @@ -8,11 +8,12 @@ // and track call stacks for any allocations that are made. It can // then be used to see what memory is in use. -#ifndef MEMORY_WATCHER_MEMORY_WATCHER_ -#define MEMORY_WATCHER_MEMORY_WATCHER_ +#ifndef TOOLS_MEMORY_WATCHER_MEMORY_WATCHER_ +#define TOOLS_MEMORY_WATCHER_MEMORY_WATCHER_ #include #include + #include "base/lock.h" #include "tools/memory_watcher/memory_hook.h" @@ -91,4 +92,4 @@ class MemoryWatcher : MemoryObserver { -#endif // MEMORY_WATCHER_ +#endif // TOOLS_MEMORY_WATCHER_MEMORY_WATCHER_ -- cgit v1.1