From 4ac61acb3a7dad6ce722fe07564be8ec92713228 Mon Sep 17 00:00:00 2001 From: dmaclach Date: Mon, 19 Jul 2010 20:43:49 +0000 Subject: Clean up build for 64 bit. Fix up some broken mac projects. Consolidate project settings in xcconfig files. http://breakpad.appspot.com/130001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@627 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/module.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/common/module.cc') diff --git a/src/common/module.cc b/src/common/module.cc index 01f4985f..c980b96f 100644 --- a/src/common/module.cc +++ b/src/common/module.cc @@ -49,7 +49,7 @@ Module::Module(const string &name, const string &os, Module::~Module() { for (FileByNameMap::iterator it = files_.begin(); it != files_.end(); it++) delete it->second; - for (set::iterator it = functions_.begin(); + for (FunctionSet::iterator it = functions_.begin(); it != functions_.end(); it++) delete *it; for (vector::iterator it = stack_frame_entries_.begin(); @@ -62,7 +62,7 @@ void Module::SetLoadAddress(Address address) { } void Module::AddFunction(Function *function) { - std::pair::iterator,bool> ret = functions_.insert(function); + std::pair ret = functions_.insert(function); if (!ret.second) { // Free the duplicate we failed to insert because we own it. delete function; @@ -135,7 +135,7 @@ void Module::AssignSourceIds() { // Next, mark all files actually cited by our functions' line number // info, by setting each one's source id to zero. - for (set::const_iterator func_it = functions_.begin(); + for (FunctionSet::const_iterator func_it = functions_.begin(); func_it != functions_.end(); func_it++) { Function *func = *func_it; for (vector::iterator line_it = func->lines.begin(); @@ -192,7 +192,7 @@ bool Module::Write(FILE *stream) { } // Write out functions and their lines. - for (set::const_iterator func_it = functions_.begin(); + for (FunctionSet::const_iterator func_it = functions_.begin(); func_it != functions_.end(); func_it++) { Function *func = *func_it; if (0 > fprintf(stream, "FUNC %llx %llx %llx %s\n", -- cgit v1.2.1