From 1c4f4a776c1958d3d736d6cd905c48ff199ccfad Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Tue, 22 Jan 2013 17:20:42 +0000 Subject: [PATCH] Fix remaining processor/scoped_ptr.h references after r1096. Review URL: https://breakpad.appspot.com/516002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1103 4c0a9323-5329-0410-9bdc-e9ce6186880e --- Makefile.am | 2 +- Makefile.in | 3 ++- src/client/windows/crash_generation/client_info.h | 2 +- src/client/windows/crash_generation/crash_generation_client.h | 2 +- src/client/windows/crash_generation/crash_generation_server.cc | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index b374fe2e..8649816f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -178,7 +178,6 @@ src_libbreakpad_a_SOURCES = \ src/processor/process_state.cc \ src/processor/range_map-inl.h \ src/processor/range_map.h \ - src/processor/scoped_ptr.h \ src/processor/simple_serializer-inl.h \ src/processor/simple_serializer.h \ src/processor/simple_symbol_supplier.cc \ @@ -1042,6 +1041,7 @@ EXTRA_DIST = \ src/common/mac/string_utilities.h \ src/common/md5.cc \ src/common/md5.h \ + src/common/scoped_ptr.h \ src/common/solaris/dump_symbols.cc \ src/common/solaris/dump_symbols.h \ src/common/solaris/file_id.cc \ diff --git a/Makefile.in b/Makefile.in index 9d07f411..68343586 100644 --- a/Makefile.in +++ b/Makefile.in @@ -297,7 +297,7 @@ am__src_libbreakpad_a_SOURCES_DIST = \ src/processor/postfix_evaluator-inl.h \ src/processor/postfix_evaluator.h \ src/processor/process_state.cc src/processor/range_map-inl.h \ - src/processor/range_map.h src/processor/scoped_ptr.h \ + src/processor/range_map.h \ src/processor/simple_serializer-inl.h \ src/processor/simple_serializer.h \ src/processor/simple_symbol_supplier.cc \ @@ -2229,6 +2229,7 @@ EXTRA_DIST = \ src/common/mac/string_utilities.h \ src/common/md5.cc \ src/common/md5.h \ + src/common/scoped_ptr.h \ src/common/solaris/dump_symbols.cc \ src/common/solaris/dump_symbols.h \ src/common/solaris/file_id.cc \ diff --git a/src/client/windows/crash_generation/client_info.h b/src/client/windows/crash_generation/client_info.h index a24a82e7..ce33a46b 100644 --- a/src/client/windows/crash_generation/client_info.h +++ b/src/client/windows/crash_generation/client_info.h @@ -33,8 +33,8 @@ #include #include #include "client/windows/common/ipc_protocol.h" +#include "common/scoped_ptr.h" #include "google_breakpad/common/minidump_format.h" -#include "processor/scoped_ptr.h" namespace google_breakpad { diff --git a/src/client/windows/crash_generation/crash_generation_client.h b/src/client/windows/crash_generation/crash_generation_client.h index 2ce14dd2..457f7319 100644 --- a/src/client/windows/crash_generation/crash_generation_client.h +++ b/src/client/windows/crash_generation/crash_generation_client.h @@ -35,7 +35,7 @@ #include #include #include "client/windows/common/ipc_protocol.h" -#include "processor/scoped_ptr.h" +#include "common/scoped_ptr.h" namespace google_breakpad { diff --git a/src/client/windows/crash_generation/crash_generation_server.cc b/src/client/windows/crash_generation/crash_generation_server.cc index 8f6f986d..676dec2d 100644 --- a/src/client/windows/crash_generation/crash_generation_server.cc +++ b/src/client/windows/crash_generation/crash_generation_server.cc @@ -32,7 +32,7 @@ #include #include #include "client/windows/common/auto_critical_section.h" -#include "processor/scoped_ptr.h" +#include "common/scoped_ptr.h" #include "client/windows/crash_generation/client_info.h"