Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(85)

Side by Side Diff: google_breakpad/processor/system_info.h

Issue 400002: Mechanical change to allow the co-existance of std::string with a global ::string class (Closed) Base URL: http://google-breakpad.googlecode.com/svn/trunk/src/
Patch Set: Extended the impact of this change to a couple of more files under src/client Created 12 years, 9 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « google_breakpad/processor/symbol_supplier.h ('k') | processor/basic_code_module.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006, Google Inc. 1 // Copyright (c) 2006, Google Inc.
2 // All rights reserved. 2 // All rights reserved.
3 // 3 //
4 // Redistribution and use in source and binary forms, with or without 4 // Redistribution and use in source and binary forms, with or without
5 // modification, are permitted provided that the following conditions are 5 // modification, are permitted provided that the following conditions are
6 // met: 6 // met:
7 // 7 //
8 // * Redistributions of source code must retain the above copyright 8 // * Redistributions of source code must retain the above copyright
9 // notice, this list of conditions and the following disclaimer. 9 // notice, this list of conditions and the following disclaimer.
10 // * Redistributions in binary form must reproduce the above 10 // * Redistributions in binary form must reproduce the above
(...skipping 19 matching lines...) Expand all
30 // system_info.h: Information about the system that was running a program 30 // system_info.h: Information about the system that was running a program
31 // when a crash report was produced. 31 // when a crash report was produced.
32 // 32 //
33 // Author: Mark Mentovai 33 // Author: Mark Mentovai
34 34
35 #ifndef GOOGLE_BREAKPAD_PROCESSOR_SYSTEM_INFO_H__ 35 #ifndef GOOGLE_BREAKPAD_PROCESSOR_SYSTEM_INFO_H__
36 #define GOOGLE_BREAKPAD_PROCESSOR_SYSTEM_INFO_H__ 36 #define GOOGLE_BREAKPAD_PROCESSOR_SYSTEM_INFO_H__
37 37
38 #include <string> 38 #include <string>
39 39
40 #include "common/using_std_string.h"
41
40 namespace google_breakpad { 42 namespace google_breakpad {
41 43
42 using std::string;
43
44 struct SystemInfo { 44 struct SystemInfo {
45 public: 45 public:
46 SystemInfo() : os(), os_short(), os_version(), cpu(), cpu_info(), 46 SystemInfo() : os(), os_short(), os_version(), cpu(), cpu_info(),
47 cpu_count(0) {} 47 cpu_count(0) {}
48 48
49 // Resets the SystemInfo object to its default values. 49 // Resets the SystemInfo object to its default values.
50 void Clear() { 50 void Clear() {
51 os.clear(); 51 os.clear();
52 os_short.clear(); 52 os_short.clear();
53 os_version.clear(); 53 os_version.clear();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 string cpu_info; 88 string cpu_info;
89 89
90 // The number of processors in the system. Will be greater than one for 90 // The number of processors in the system. Will be greater than one for
91 // multi-core systems. 91 // multi-core systems.
92 int cpu_count; 92 int cpu_count;
93 }; 93 };
94 94
95 } // namespace google_breakpad 95 } // namespace google_breakpad
96 96
97 #endif // GOOGLE_BREAKPAD_PROCESSOR_SYSTEM_INFO_H__ 97 #endif // GOOGLE_BREAKPAD_PROCESSOR_SYSTEM_INFO_H__
OLDNEW
« no previous file with comments | « google_breakpad/processor/symbol_supplier.h ('k') | processor/basic_code_module.h » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld 1004:630ec63f810e-tainted