diff options
| author | ted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-06-25 16:57:07 +0000 |
|---|---|---|
| committer | ted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-06-25 16:57:07 +0000 |
| commit | e1930985430ce289f4fe8525f51050e5d78cc44e (patch) | |
| tree | 206f5e39aaed754ba47322468ece20dc11ade144 /src/processor | |
| parent | Breakpad DWARF CFI support: Cleanups requested by Neal (diff) | |
| download | breakpad-e1930985430ce289f4fe8525f51050e5d78cc44e.tar.xz | |
Breakpad: Avoid using the C++ <cfoo> headers.
This patch avoids unnecessary use of the <cfoo> headers in files that don't
actually use the identifiers they declare in the std:: namespace.
It also changes some files to better conform with the "Names and Order of
Includes" rules in the Google C++ Style Guide.
A=jimb R=mark
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@619 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/processor')
26 files changed, 64 insertions, 46 deletions
diff --git a/src/processor/address_map-inl.h b/src/processor/address_map-inl.h index d88b4fcc..251c4478 100644 --- a/src/processor/address_map-inl.h +++ b/src/processor/address_map-inl.h @@ -36,9 +36,10 @@ #ifndef PROCESSOR_ADDRESS_MAP_INL_H__ #define PROCESSOR_ADDRESS_MAP_INL_H__ -#include <cassert> - #include "processor/address_map.h" + +#include <assert.h> + #include "processor/logging.h" namespace google_breakpad { diff --git a/src/processor/address_map_unittest.cc b/src/processor/address_map_unittest.cc index f64a8984..9b4095b1 100644 --- a/src/processor/address_map_unittest.cc +++ b/src/processor/address_map_unittest.cc @@ -31,8 +31,8 @@ // // Author: Mark Mentovai -#include <climits> -#include <cstdio> +#include <limits.h> +#include <stdio.h> #include "processor/address_map-inl.h" #include "processor/linked_ptr.h" diff --git a/src/processor/basic_code_modules.cc b/src/processor/basic_code_modules.cc index a21491c4..63da8995 100644 --- a/src/processor/basic_code_modules.cc +++ b/src/processor/basic_code_modules.cc @@ -34,9 +34,10 @@ // // Author: Mark Mentovai -#include <cassert> - #include "processor/basic_code_modules.h" + +#include <assert.h> + #include "google_breakpad/processor/code_module.h" #include "processor/linked_ptr.h" #include "processor/logging.h" diff --git a/src/processor/basic_source_line_resolver_unittest.cc b/src/processor/basic_source_line_resolver_unittest.cc index 693a5ce5..c241ea0a 100644 --- a/src/processor/basic_source_line_resolver_unittest.cc +++ b/src/processor/basic_source_line_resolver_unittest.cc @@ -27,7 +27,8 @@ // (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 <cstdio> +#include <stdio.h> + #include <string> #include "breakpad_googletest_includes.h" diff --git a/src/processor/cfi_frame_info.cc b/src/processor/cfi_frame_info.cc index 135eee21..1ded99d3 100644 --- a/src/processor/cfi_frame_info.cc +++ b/src/processor/cfi_frame_info.cc @@ -32,10 +32,12 @@ // cfi_frame_info.cc: Implementation of CFIFrameInfo class. // See cfi_frame_info.h for details. -#include <cstring> +#include "processor/cfi_frame_info.h" + +#include <string.h> + #include <sstream> -#include "processor/cfi_frame_info.h" #include "processor/postfix_evaluator-inl.h" #include "processor/scoped_ptr.h" diff --git a/src/processor/contained_range_map-inl.h b/src/processor/contained_range_map-inl.h index 5cc498df..4c0ad41f 100644 --- a/src/processor/contained_range_map-inl.h +++ b/src/processor/contained_range_map-inl.h @@ -36,10 +36,10 @@ #ifndef PROCESSOR_CONTAINED_RANGE_MAP_INL_H__ #define PROCESSOR_CONTAINED_RANGE_MAP_INL_H__ +#include "processor/contained_range_map.h" -#include <cassert> +#include <assert.h> -#include "processor/contained_range_map.h" #include "processor/logging.h" diff --git a/src/processor/contained_range_map_unittest.cc b/src/processor/contained_range_map_unittest.cc index 6b65b4e1..e5910da0 100644 --- a/src/processor/contained_range_map_unittest.cc +++ b/src/processor/contained_range_map_unittest.cc @@ -31,7 +31,7 @@ // // Author: Mark Mentovai -#include <cstdio> +#include <stdio.h> #include "processor/contained_range_map-inl.h" diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc index f3fb2942..2398e9b9 100644 --- a/src/processor/minidump.cc +++ b/src/processor/minidump.cc @@ -33,7 +33,9 @@ // // Author: Mark Mentovai +#include "google_breakpad/processor/minidump.h" +#include <assert.h> #include <fcntl.h> #include <stdio.h> #include <string.h> @@ -49,7 +51,6 @@ typedef SSIZE_T ssize_t; #define O_BINARY 0 #endif // _WIN32 -#include <cassert> #include <fstream> #include <iostream> #include <limits> @@ -58,7 +59,6 @@ typedef SSIZE_T ssize_t; #include "processor/range_map-inl.h" -#include "google_breakpad/processor/minidump.h" #include "processor/basic_code_module.h" #include "processor/basic_code_modules.h" #include "processor/logging.h" diff --git a/src/processor/minidump_dump.cc b/src/processor/minidump_dump.cc index b586252f..6ec777f1 100644 --- a/src/processor/minidump_dump.cc +++ b/src/processor/minidump_dump.cc @@ -32,7 +32,7 @@ // // Author: Mark Mentovai -#include <cstdio> +#include <stdio.h> #include "google_breakpad/processor/minidump.h" #include "processor/logging.h" diff --git a/src/processor/minidump_processor.cc b/src/processor/minidump_processor.cc index e1583f49..b090ecbd 100644 --- a/src/processor/minidump_processor.cc +++ b/src/processor/minidump_processor.cc @@ -27,10 +27,11 @@ // (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 <cassert> -#include <cstdio> - #include "google_breakpad/processor/minidump_processor.h" + +#include <assert.h> +#include <stdio.h> + #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/minidump.h" #include "google_breakpad/processor/process_state.h" diff --git a/src/processor/minidump_processor_unittest.cc b/src/processor/minidump_processor_unittest.cc index f93ee157..8fd21fbd 100644 --- a/src/processor/minidump_processor_unittest.cc +++ b/src/processor/minidump_processor_unittest.cc @@ -30,11 +30,13 @@ // Unit test for MinidumpProcessor. Uses a pre-generated minidump and // corresponding symbol file, and checks the stack frames for correctness. -#include <cstdlib> +#include <stdlib.h> + #include <string> #include <iostream> #include <fstream> #include <map> + #include "breakpad_googletest_includes.h" #include "google_breakpad/processor/basic_source_line_resolver.h" #include "google_breakpad/processor/call_stack.h" diff --git a/src/processor/minidump_stackwalk.cc b/src/processor/minidump_stackwalk.cc index 2c3ab359..66b12578 100644 --- a/src/processor/minidump_stackwalk.cc +++ b/src/processor/minidump_stackwalk.cc @@ -32,9 +32,10 @@ // // Author: Mark Mentovai -#include <cstdio> -#include <cstdlib> -#include <cstring> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + #include <string> #include <vector> diff --git a/src/processor/network_source_line_resolver.cc b/src/processor/network_source_line_resolver.cc index 5fc5b1ea..f342c7a4 100644 --- a/src/processor/network_source_line_resolver.cc +++ b/src/processor/network_source_line_resolver.cc @@ -27,14 +27,15 @@ // (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 "google_breakpad/processor/network_source_line_resolver.h" + +#include <assert.h> #include <stdlib.h> #include <string.h> -#include <cassert> #include <sstream> #include <vector> -#include "google_breakpad/processor/network_source_line_resolver.h" #include "google_breakpad/processor/stack_frame.h" #include "processor/binarystream.h" #include "processor/cfi_frame_info.h" diff --git a/src/processor/pathname_stripper_unittest.cc b/src/processor/pathname_stripper_unittest.cc index 54f04b78..1bff4cb0 100644 --- a/src/processor/pathname_stripper_unittest.cc +++ b/src/processor/pathname_stripper_unittest.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 <cstdio> +#include <stdio.h> #include "processor/pathname_stripper.h" #include "processor/logging.h" diff --git a/src/processor/postfix_evaluator-inl.h b/src/processor/postfix_evaluator-inl.h index b1252f68..0ebb57d6 100644 --- a/src/processor/postfix_evaluator-inl.h +++ b/src/processor/postfix_evaluator-inl.h @@ -39,11 +39,12 @@ #ifndef PROCESSOR_POSTFIX_EVALUATOR_INL_H__ #define PROCESSOR_POSTFIX_EVALUATOR_INL_H__ +#include "processor/postfix_evaluator.h" + +#include <stdio.h> -#include <cstdio> #include <sstream> -#include "processor/postfix_evaluator.h" #include "google_breakpad/processor/memory_region.h" #include "processor/logging.h" diff --git a/src/processor/postfix_evaluator_unittest.cc b/src/processor/postfix_evaluator_unittest.cc index e20a2b8f..0c2d8ece 100644 --- a/src/processor/postfix_evaluator_unittest.cc +++ b/src/processor/postfix_evaluator_unittest.cc @@ -31,7 +31,8 @@ // // Author: Mark Mentovai -#include <cstdio> +#include <stdio.h> + #include <map> #include <string> diff --git a/src/processor/range_map-inl.h b/src/processor/range_map-inl.h index 71761915..e7bf4512 100644 --- a/src/processor/range_map-inl.h +++ b/src/processor/range_map-inl.h @@ -37,7 +37,7 @@ #define PROCESSOR_RANGE_MAP_INL_H__ -#include <cassert> +#include <assert.h> #include "processor/range_map.h" #include "processor/logging.h" diff --git a/src/processor/range_map_unittest.cc b/src/processor/range_map_unittest.cc index bcf87ce2..dd713fba 100644 --- a/src/processor/range_map_unittest.cc +++ b/src/processor/range_map_unittest.cc @@ -32,8 +32,8 @@ // Author: Mark Mentovai -#include <climits> -#include <cstdio> +#include <limits.h> +#include <stdio.h> #include "processor/range_map-inl.h" diff --git a/src/processor/simple_symbol_supplier.cc b/src/processor/simple_symbol_supplier.cc index c593e955..544a42cb 100644 --- a/src/processor/simple_symbol_supplier.cc +++ b/src/processor/simple_symbol_supplier.cc @@ -33,15 +33,16 @@ // // Author: Mark Mentovai +#include "processor/simple_symbol_supplier.h" + +#include <assert.h> #include <sys/types.h> #include <sys/stat.h> #include <algorithm> -#include <cassert> #include <iostream> #include <fstream> -#include "processor/simple_symbol_supplier.h" #include "google_breakpad/processor/code_module.h" #include "google_breakpad/processor/system_info.h" #include "processor/logging.h" diff --git a/src/processor/stackwalker.cc b/src/processor/stackwalker.cc index a45407db..8552e2f3 100644 --- a/src/processor/stackwalker.cc +++ b/src/processor/stackwalker.cc @@ -33,10 +33,10 @@ // // Author: Mark Mentovai +#include "google_breakpad/processor/stackwalker.h" -#include <cassert> +#include <assert.h> -#include "google_breakpad/processor/stackwalker.h" #include "google_breakpad/processor/call_stack.h" #include "google_breakpad/processor/code_module.h" #include "google_breakpad/processor/code_modules.h" diff --git a/src/processor/stackwalker_selftest.cc b/src/processor/stackwalker_selftest.cc index 6b71a6a8..fdd15270 100644 --- a/src/processor/stackwalker_selftest.cc +++ b/src/processor/stackwalker_selftest.cc @@ -62,7 +62,7 @@ (defined(__i386__) || defined(__ppc__) || defined(__sparc__)) -#include <cstdio> +#include <stdio.h> #include "google_breakpad/common/breakpad_types.h" #include "google_breakpad/common/minidump_format.h" diff --git a/src/processor/synth_minidump.h b/src/processor/synth_minidump.h index 690ec399..6219272d 100644 --- a/src/processor/synth_minidump.h +++ b/src/processor/synth_minidump.h @@ -108,7 +108,8 @@ #ifndef PROCESSOR_SYNTH_MINIDUMP_H_ #define PROCESSOR_SYNTH_MINIDUMP_H_ -#include <cassert> +#include <assert.h> + #include <iostream> #include <string> diff --git a/src/processor/testdata/linux_test_app.cc b/src/processor/testdata/linux_test_app.cc index 9a6a1940..f1617b76 100644 --- a/src/processor/testdata/linux_test_app.cc +++ b/src/processor/testdata/linux_test_app.cc @@ -39,9 +39,10 @@ // generate an executable with STABS symbols (needs -m32), or -gdwarf-2 for one // with DWARF symbols (32- or 64-bit) +#include <stdio.h> #include <sys/types.h> #include <unistd.h> -#include <cstdio> + #include <string> #include "common/linux/linux_syscall_support.h" diff --git a/src/processor/testdata/test_app.cc b/src/processor/testdata/test_app.cc index f230ef3f..7882a8bd 100644 --- a/src/processor/testdata/test_app.cc +++ b/src/processor/testdata/test_app.cc @@ -32,7 +32,7 @@ // google_breakpad/src/client/windows/releasestaticcrt/exception_handler.lib // Then run test_app to generate a dump, and dump_syms to create the .sym file. -#include <cstdio> +#include <stdio.h> #include "client/windows/handler/exception_handler.h" diff --git a/src/processor/udp_network.cc b/src/processor/udp_network.cc index 52072841..0cb911e0 100644 --- a/src/processor/udp_network.cc +++ b/src/processor/udp_network.cc @@ -27,21 +27,23 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "processor/udp_network.h" + #include <arpa/inet.h> #include <errno.h> #include <netdb.h> #include <netinet/in.h> +#include <stdio.h> +#include <string.h> #include <sys/socket.h> -#include <cstdio> -#include <cstring> #include <string> -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "processor/logging.h" -#include "processor/udp_network.h" namespace google_breakpad { using std::string; diff --git a/src/processor/windows_frame_info.h b/src/processor/windows_frame_info.h index cca78b88..79e74638 100644 --- a/src/processor/windows_frame_info.h +++ b/src/processor/windows_frame_info.h @@ -38,7 +38,8 @@ #ifndef PROCESSOR_WINDOWS_FRAME_INFO_H__ #define PROCESSOR_WINDOWS_FRAME_INFO_H__ -#include <cstring> +#include <string.h> + #include <string> #include <vector> |