diff options
Diffstat (limited to 'src')
34 files changed, 38 insertions, 39 deletions
diff --git a/src/client/ios/BreakpadController.mm b/src/client/ios/BreakpadController.mm index 4e69fae2..01312c8f 100644 --- a/src/client/ios/BreakpadController.mm +++ b/src/client/ios/BreakpadController.mm @@ -36,7 +36,7 @@ #include <unistd.h> #include <sys/sysctl.h> -#include <processor/scoped_ptr.h> +#include <common/scoped_ptr.h> #pragma mark - #pragma mark Private Methods diff --git a/src/client/ios/handler/ios_exception_minidump_generator.mm b/src/client/ios/handler/ios_exception_minidump_generator.mm index b8aebc29..912c4312 100644 --- a/src/client/ios/handler/ios_exception_minidump_generator.mm +++ b/src/client/ios/handler/ios_exception_minidump_generator.mm @@ -31,7 +31,7 @@ #include "google_breakpad/common/minidump_exception_mac.h" #include "client/minidump_file_writer-inl.h" -#include "processor/scoped_ptr.h" +#include "common/scoped_ptr.h" namespace { diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h index 7e6f8649..bd510d9e 100644 --- a/src/client/linux/handler/exception_handler.h +++ b/src/client/linux/handler/exception_handler.h @@ -42,9 +42,9 @@ #include "client/linux/crash_generation/crash_generation_client.h" #include "client/linux/handler/minidump_descriptor.h" #include "client/linux/minidump_writer/minidump_writer.h" +#include "common/scoped_ptr.h" #include "common/using_std_string.h" #include "google_breakpad/common/minidump_format.h" -#include "processor/scoped_ptr.h" namespace google_breakpad { diff --git a/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc b/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc index df4ecece..68020694 100644 --- a/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +++ b/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc @@ -38,7 +38,7 @@ #include <sys/syscall.h> #include <unistd.h> -#include "processor/scoped_ptr.h" +#include "common/scoped_ptr.h" #include "third_party/lss/linux_syscall_support.h" #if defined(__ARM_EABI__) diff --git a/src/client/linux/minidump_writer/minidump_writer_unittest.cc b/src/client/linux/minidump_writer/minidump_writer_unittest.cc index 919104ee..d884a42b 100644 --- a/src/client/linux/minidump_writer/minidump_writer_unittest.cc +++ b/src/client/linux/minidump_writer/minidump_writer_unittest.cc @@ -46,11 +46,11 @@ #include "common/linux/file_id.h" #include "common/linux/ignore_ret.h" #include "common/linux/safe_readlink.h" +#include "common/scoped_ptr.h" #include "common/tests/auto_tempdir.h" #include "common/tests/file_utils.h" #include "common/using_std_string.h" #include "google_breakpad/processor/minidump.h" -#include "processor/scoped_ptr.h" using namespace google_breakpad; diff --git a/src/client/mac/handler/exception_handler.h b/src/client/mac/handler/exception_handler.h index 7babcf66..b5e8bbaa 100644 --- a/src/client/mac/handler/exception_handler.h +++ b/src/client/mac/handler/exception_handler.h @@ -41,7 +41,7 @@ #include <string> -#include "processor/scoped_ptr.h" +#include "common/scoped_ptr.h" #if !TARGET_OS_IPHONE #include "client/mac/crash_generation/crash_generation_client.h" diff --git a/src/client/windows/handler/exception_handler.h b/src/client/windows/handler/exception_handler.h index c1945e1e..ec9aabcd 100644 --- a/src/client/windows/handler/exception_handler.h +++ b/src/client/windows/handler/exception_handler.h @@ -71,8 +71,8 @@ #include "client/windows/common/ipc_protocol.h" #include "client/windows/crash_generation/crash_generation_client.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/common/mac/string_utilities.cc b/src/common/mac/string_utilities.cc index e1f63a98..07c0f426 100644 --- a/src/common/mac/string_utilities.cc +++ b/src/common/mac/string_utilities.cc @@ -27,7 +27,7 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "processor/scoped_ptr.h" +#include "common/scoped_ptr.h" #include "common/mac/string_utilities.h" namespace MacStringUtils { diff --git a/src/processor/scoped_ptr.h b/src/common/scoped_ptr.h index 0d4f7fd3..2dbc40df 100644 --- a/src/processor/scoped_ptr.h +++ b/src/common/scoped_ptr.h @@ -46,8 +46,8 @@ // Use this to conditionally transfer ownership of a heap-allocated object // to the caller, usually on method success. -#ifndef PROCESSOR_SCOPED_PTR_H__ -#define PROCESSOR_SCOPED_PTR_H__ +#ifndef COMMON_SCOPED_PTR_H_ +#define COMMON_SCOPED_PTR_H_ #include <cstddef> // for std::ptrdiff_t #include <assert.h> // for assert @@ -332,4 +332,4 @@ bool operator!=(T* p, const scoped_ptr_malloc<T,FP>& b) { } // namespace google_breakpad -#endif // PROCESSOR_SCOPED_PTR_H__ +#endif // COMMON_SCOPED_PTR_H_ diff --git a/src/common/solaris/dump_symbols.cc b/src/common/solaris/dump_symbols.cc index b1e995dd..fb040265 100644 --- a/src/common/solaris/dump_symbols.cc +++ b/src/common/solaris/dump_symbols.cc @@ -43,10 +43,10 @@ #include <map> #include <vector> +#include "common/scoped_ptr.h" #include "common/solaris/dump_symbols.h" #include "common/solaris/file_id.h" #include "common/solaris/guid_creator.h" -#include "processor/scoped_ptr.h" // This namespace contains helper functions. namespace { diff --git a/src/common/string_conversion.cc b/src/common/string_conversion.cc index b4f4d77e..444ac817 100644 --- a/src/common/string_conversion.cc +++ b/src/common/string_conversion.cc @@ -30,9 +30,9 @@ #include <string.h> #include "common/convert_UTF.h" +#include "common/scoped_ptr.h" #include "common/string_conversion.h" #include "common/using_std_string.h" -#include "processor/scoped_ptr.h" namespace google_breakpad { diff --git a/src/processor/basic_source_line_resolver_types.h b/src/processor/basic_source_line_resolver_types.h index 87b93db9..94616dcb 100644 --- a/src/processor/basic_source_line_resolver_types.h +++ b/src/processor/basic_source_line_resolver_types.h @@ -40,6 +40,7 @@ #include <map> #include <string> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/basic_source_line_resolver.h" #include "processor/source_line_resolver_base_types.h" @@ -48,7 +49,6 @@ #include "processor/contained_range_map-inl.h" #include "processor/linked_ptr.h" -#include "processor/scoped_ptr.h" #include "google_breakpad/processor/stack_frame.h" #include "processor/cfi_frame_info.h" #include "processor/windows_frame_info.h" diff --git a/src/processor/basic_source_line_resolver_unittest.cc b/src/processor/basic_source_line_resolver_unittest.cc index bf8507ae..6e3c164c 100644 --- a/src/processor/basic_source_line_resolver_unittest.cc +++ b/src/processor/basic_source_line_resolver_unittest.cc @@ -32,6 +32,7 @@ #include <string> #include "breakpad_googletest_includes.h" +#include "common/scoped_ptr.h" #include "common/using_std_string.h" #include "google_breakpad/processor/basic_source_line_resolver.h" #include "google_breakpad/processor/code_module.h" @@ -39,7 +40,6 @@ #include "google_breakpad/processor/memory_region.h" #include "processor/linked_ptr.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" #include "processor/windows_frame_info.h" #include "processor/cfi_frame_info.h" diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc index 1ded99d3..d8394619 100644 --- a/src/processor/cfi_frame_info.cc +++ b/src/processor/cfi_frame_info.cc @@ -38,8 +38,8 @@ #include <sstream> +#include "common/scoped_ptr.h" #include "processor/postfix_evaluator-inl.h" -#include "processor/scoped_ptr.h" namespace google_breakpad { diff --git a/src/processor/exploitability.cc b/src/processor/exploitability.cc index 459e7ce1..16807a3c 100644 --- a/src/processor/exploitability.cc +++ b/src/processor/exploitability.cc @@ -36,12 +36,12 @@ #include <cassert> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/exploitability.h" #include "google_breakpad/processor/minidump.h" #include "google_breakpad/processor/process_state.h" #include "processor/exploitability_win.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" namespace google_breakpad { diff --git a/src/processor/exploitability_win.cc b/src/processor/exploitability_win.cc index 443635fb..e0798452 100644 --- a/src/processor/exploitability_win.cc +++ b/src/processor/exploitability_win.cc @@ -38,11 +38,11 @@ #include "processor/exploitability_win.h" +#include "common/scoped_ptr.h" #include "google_breakpad/common/minidump_exception_win32.h" #include "google_breakpad/processor/minidump.h" #include "processor/disassembler_x86.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" #include "third_party/libdisasm/libdis.h" diff --git a/src/processor/fast_source_line_resolver.cc b/src/processor/fast_source_line_resolver.cc index a7b99331..29a8f091 100644 --- a/src/processor/fast_source_line_resolver.cc +++ b/src/processor/fast_source_line_resolver.cc @@ -44,9 +44,9 @@ #include <string> #include <utility> +#include "common/scoped_ptr.h" #include "common/using_std_string.h" #include "processor/module_factory.h" -#include "processor/scoped_ptr.h" using std::map; using std::make_pair; diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc index 0bd1f6ba..d033a0b6 100644 --- a/src/processor/minidump.cc +++ b/src/processor/minidump.cc @@ -60,10 +60,11 @@ typedef SSIZE_T ssize_t; #include "processor/range_map-inl.h" +#include "common/scoped_ptr.h" #include "processor/basic_code_module.h" #include "processor/basic_code_modules.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" + namespace google_breakpad { diff --git a/src/processor/minidump_dump.cc b/src/processor/minidump_dump.cc index 869a7632..f14aee85 100644 --- a/src/processor/minidump_dump.cc +++ b/src/processor/minidump_dump.cc @@ -35,9 +35,9 @@ #include <stdio.h> #include <string.h> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/minidump.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" namespace { diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc index db5b271a..14615ee9 100644 --- a/src/processor/minidump_processor.cc +++ b/src/processor/minidump_processor.cc @@ -32,13 +32,13 @@ #include <assert.h> #include <stdio.h> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/minidump.h" #include "google_breakpad/processor/process_state.h" #include "google_breakpad/processor/exploitability.h" #include "google_breakpad/processor/stack_frame_symbolizer.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" #include "processor/stackwalker_x86.h" namespace google_breakpad { diff --git a/src/processor/minidump_processor_unittest.cc b/src/processor/minidump_processor_unittest.cc index 917caaf4..999637d3 100644 --- a/src/processor/minidump_processor_unittest.cc +++ b/src/processor/minidump_processor_unittest.cc @@ -39,6 +39,7 @@ #include <utility> #include "breakpad_googletest_includes.h" +#include "common/scoped_ptr.h" #include "common/using_std_string.h" #include "google_breakpad/processor/basic_source_line_resolver.h" #include "google_breakpad/processor/call_stack.h" @@ -50,7 +51,6 @@ #include "google_breakpad/processor/stack_frame.h" #include "google_breakpad/processor/symbol_supplier.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" #include "processor/stackwalker_unittest_utils.h" using std::map; diff --git a/src/processor/minidump_stackwalk.cc b/src/processor/minidump_stackwalk.cc index b3137d97..7218fd88 100644 --- a/src/processor/minidump_stackwalk.cc +++ b/src/processor/minidump_stackwalk.cc @@ -39,6 +39,7 @@ #include <string> #include <vector> +#include "common/scoped_ptr.h" #include "common/using_std_string.h" #include "google_breakpad/processor/basic_source_line_resolver.h" #include "google_breakpad/processor/call_stack.h" @@ -50,7 +51,6 @@ #include "google_breakpad/processor/stack_frame_cpu.h" #include "processor/logging.h" #include "processor/pathname_stripper.h" -#include "processor/scoped_ptr.h" #include "processor/simple_symbol_supplier.h" namespace { diff --git a/src/processor/module_comparer.cc b/src/processor/module_comparer.cc index 09b85e03..ba561eea 100644 --- a/src/processor/module_comparer.cc +++ b/src/processor/module_comparer.cc @@ -37,9 +37,9 @@ #include <map> #include <string> +#include "common/scoped_ptr.h" #include "processor/basic_code_module.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" #define ASSERT_TRUE(condition) \ if (!(condition)) { \ diff --git a/src/processor/range_map_unittest.cc b/src/processor/range_map_unittest.cc index 996ae6d7..bf9b7279 100644 --- a/src/processor/range_map_unittest.cc +++ b/src/processor/range_map_unittest.cc @@ -37,10 +37,9 @@ #include "processor/range_map-inl.h" +#include "common/scoped_ptr.h" #include "processor/linked_ptr.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" - namespace { diff --git a/src/processor/stack_frame_symbolizer.cc b/src/processor/stack_frame_symbolizer.cc index e12fccbc..5d95abbf 100644 --- a/src/processor/stack_frame_symbolizer.cc +++ b/src/processor/stack_frame_symbolizer.cc @@ -36,6 +36,7 @@ #include <assert.h> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/code_module.h" #include "google_breakpad/processor/code_modules.h" #include "google_breakpad/processor/source_line_resolver_interface.h" @@ -44,7 +45,6 @@ #include "google_breakpad/processor/system_info.h" #include "processor/linked_ptr.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" namespace google_breakpad { diff --git a/src/processor/stackwalker.cc b/src/processor/stackwalker.cc index 16880441..37664d41 100644 --- a/src/processor/stackwalker.cc +++ b/src/processor/stackwalker.cc @@ -37,6 +37,7 @@ #include <assert.h> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/code_module.h" #include "google_breakpad/processor/code_modules.h" @@ -46,7 +47,6 @@ #include "google_breakpad/processor/system_info.h" #include "processor/linked_ptr.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" #include "processor/stackwalker_ppc.h" #include "processor/stackwalker_sparc.h" #include "processor/stackwalker_x86.h" diff --git a/src/processor/stackwalker_amd64.cc b/src/processor/stackwalker_amd64.cc index b7d3274d..0fec3d71 100644 --- a/src/processor/stackwalker_amd64.cc +++ b/src/processor/stackwalker_amd64.cc @@ -34,13 +34,13 @@ // Author: Mark Mentovai, Ted Mielczarek +#include "common/scoped_ptr.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/memory_region.h" #include "google_breakpad/processor/source_line_resolver_interface.h" #include "google_breakpad/processor/stack_frame_cpu.h" #include "processor/cfi_frame_info.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" #include "processor/stackwalker_amd64.h" namespace google_breakpad { diff --git a/src/processor/stackwalker_arm.cc b/src/processor/stackwalker_arm.cc index da07fbcf..05df3d19 100644 --- a/src/processor/stackwalker_arm.cc +++ b/src/processor/stackwalker_arm.cc @@ -35,13 +35,13 @@ #include <vector> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/memory_region.h" #include "google_breakpad/processor/source_line_resolver_interface.h" #include "google_breakpad/processor/stack_frame_cpu.h" #include "processor/cfi_frame_info.h" #include "processor/logging.h" -#include "processor/scoped_ptr.h" #include "processor/stackwalker_arm.h" namespace google_breakpad { diff --git a/src/processor/stackwalker_selftest.cc b/src/processor/stackwalker_selftest.cc index fdd15270..8c343eb9 100644 --- a/src/processor/stackwalker_selftest.cc +++ b/src/processor/stackwalker_selftest.cc @@ -64,6 +64,7 @@ #include <stdio.h> +#include "common/scoped_ptr.h" #include "google_breakpad/common/breakpad_types.h" #include "google_breakpad/common/minidump_format.h" #include "google_breakpad/processor/basic_source_line_resolver.h" @@ -71,7 +72,6 @@ #include "google_breakpad/processor/memory_region.h" #include "google_breakpad/processor/stack_frame.h" #include "google_breakpad/processor/stack_frame_cpu.h" -#include "processor/scoped_ptr.h" using google_breakpad::BasicSourceLineResolver; using google_breakpad::CallStack; diff --git a/src/processor/stackwalker_x86.cc b/src/processor/stackwalker_x86.cc index 61d75ded..28e27809 100644 --- a/src/processor/stackwalker_x86.cc +++ b/src/processor/stackwalker_x86.cc @@ -35,6 +35,7 @@ #include <string> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/code_modules.h" #include "google_breakpad/processor/memory_region.h" @@ -42,7 +43,6 @@ #include "google_breakpad/processor/stack_frame_cpu.h" #include "processor/logging.h" #include "processor/postfix_evaluator-inl.h" -#include "processor/scoped_ptr.h" #include "processor/stackwalker_x86.h" #include "processor/windows_frame_info.h" #include "processor/cfi_frame_info.h" diff --git a/src/processor/static_contained_range_map_unittest.cc b/src/processor/static_contained_range_map_unittest.cc index 4c0c72d6..4ee47578 100644 --- a/src/processor/static_contained_range_map_unittest.cc +++ b/src/processor/static_contained_range_map_unittest.cc @@ -33,12 +33,11 @@ // Author: Siyang Xie (lambxsy@google.com) #include "breakpad_googletest_includes.h" +#include "common/scoped_ptr.h" #include "processor/contained_range_map-inl.h" #include "processor/static_contained_range_map-inl.h" #include "processor/simple_serializer-inl.h" #include "processor/map_serializers-inl.h" - -#include "processor/scoped_ptr.h" #include "processor/logging.h" namespace { diff --git a/src/processor/static_range_map_unittest.cc b/src/processor/static_range_map_unittest.cc index 82b26235..28217362 100644 --- a/src/processor/static_range_map_unittest.cc +++ b/src/processor/static_range_map_unittest.cc @@ -32,13 +32,13 @@ // Author: Siyang Xie (lambxsy@google.com) #include "breakpad_googletest_includes.h" +#include "common/scoped_ptr.h" #include "processor/range_map-inl.h" #include "processor/static_range_map-inl.h" #include "processor/simple_serializer-inl.h" #include "processor/map_serializers-inl.h" - #include "processor/logging.h" -#include "processor/scoped_ptr.h" + namespace { // Types used for testing. diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc index b29d317a..289bb980 100644 --- a/src/tools/linux/md2core/minidump-2-core.cc +++ b/src/tools/linux/md2core/minidump-2-core.cc @@ -47,8 +47,8 @@ #include <vector> #include "common/linux/memory_mapped_file.h" +#include "common/scoped_ptr.h" #include "google_breakpad/common/minidump_format.h" -#include "processor/scoped_ptr.h" #include "third_party/lss/linux_syscall_support.h" #include "tools/linux/md2core/minidump_memory_range.h" diff --git a/src/tools/mac/crash_report/crash_report.mm b/src/tools/mac/crash_report/crash_report.mm index 78eb6f27..b6e3f1cc 100644 --- a/src/tools/mac/crash_report/crash_report.mm +++ b/src/tools/mac/crash_report/crash_report.mm @@ -39,6 +39,7 @@ #include <Foundation/Foundation.h> +#include "common/scoped_ptr.h" #include "google_breakpad/processor/basic_source_line_resolver.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/code_module.h" @@ -48,7 +49,6 @@ #include "google_breakpad/processor/stack_frame_cpu.h" #include "google_breakpad/processor/system_info.h" #include "processor/pathname_stripper.h" -#include "processor/scoped_ptr.h" #include "processor/simple_symbol_supplier.h" #include "on_demand_symbol_supplier.h" |