mirror of
https://git.suyu.dev/suyu/breakpad.git
synced 2026-03-12 12:42:57 +00:00
This change allows compiling the google-breakpad code using a global ::string class instead of std::string. For more details take a look at common/using_std_string.h
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@974 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
@@ -44,6 +44,7 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "common/using_std_string.h"
|
||||
#include "google_breakpad/common/breakpad_types.h"
|
||||
#include "processor/logging.h"
|
||||
#include "processor/tokenize.h"
|
||||
@@ -91,7 +92,7 @@ struct WindowsFrameInfo {
|
||||
u_int32_t set_local_size,
|
||||
u_int32_t set_max_stack_size,
|
||||
int set_allocates_base_pointer,
|
||||
const std::string set_program_string)
|
||||
const string set_program_string)
|
||||
: type_(type),
|
||||
valid(VALID_ALL),
|
||||
prolog_size(set_prolog_size),
|
||||
@@ -107,7 +108,7 @@ struct WindowsFrameInfo {
|
||||
// a string. Returns NULL if parsing fails, or a new object
|
||||
// otherwise. type, rva and code_size are present in the STACK line,
|
||||
// but not the StackFrameInfo structure, so return them as outparams.
|
||||
static WindowsFrameInfo *ParseFromString(const std::string string,
|
||||
static WindowsFrameInfo *ParseFromString(const string string,
|
||||
int &type,
|
||||
u_int64_t &rva,
|
||||
u_int64_t &code_size) {
|
||||
@@ -195,7 +196,7 @@ struct WindowsFrameInfo {
|
||||
// Only one of allocates_base_pointer or program_string will be valid.
|
||||
// If program_string is empty, use allocates_base_pointer.
|
||||
bool allocates_base_pointer;
|
||||
std::string program_string;
|
||||
string program_string;
|
||||
};
|
||||
|
||||
} // namespace google_breakpad
|
||||
|
||||
Reference in New Issue
Block a user