suyu/breakpad
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

When the Breakpad.h header gets compiled by standard C compilers

Browse source 
(instead of C++) it gets upset about the default argument. Instead of
using a default argument I split the function up into two separate
functions.



git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1280 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
dmaclach 2014-02-18 21:34:43 +00:00
parent 5fcdc4f567
commit 0c18b07255
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/client/ios/Breakpad.h
View file

@ -200,9 +200,12 @@ void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key);
int BreakpadGetCrashReportCount(BreakpadRef ref); int BreakpadGetCrashReportCount(BreakpadRef ref);
// Upload next report to the server. // Upload next report to the server.
// |server_parameters| is additional server parameters to send (optional). void BreakpadUploadNextReport(BreakpadRef ref);
void BreakpadUploadNextReport(BreakpadRef ref,
NSDictionary *server_parameters = nil); // Upload next report to the server.
// |server_parameters| is additional server parameters to send.
void BreakpadUploadNextReportWithParameters(BreakpadRef ref,
NSDictionary *server_parameters);
// Upload a file to the server. |data| is the content of the file to sent. // Upload a file to the server. |data| is the content of the file to sent.
// |server_parameters| is additional server parameters to send. // |server_parameters| is additional server parameters to send.

9
src/client/ios/Breakpad.mm
View file

@ -789,8 +789,13 @@ int BreakpadGetCrashReportCount(BreakpadRef ref) {
} }
//============================================================================= //=============================================================================
void BreakpadUploadNextReport(BreakpadRef ref, void BreakpadUploadNextReport(BreakpadRef ref) {
NSDictionary *server_parameters) { BreakpadUploadNextReportWithParameters(ref, nil);
}
//=============================================================================
void BreakpadUploadNextReportWithParameters(BreakpadRef ref,
NSDictionary *server_parameters) {
try { try {
// Not called at exception time // Not called at exception time
Breakpad *breakpad = (Breakpad *)ref; Breakpad *breakpad = (Breakpad *)ref;

3
src/client/ios/BreakpadController.mm
View file

@ -300,7 +300,8 @@ NSString* GetPlatform() {
// A report can be sent now. // A report can be sent now.
if (timeToWait == 0) { if (timeToWait == 0) {
[self reportWillBeSent]; [self reportWillBeSent];
BreakpadUploadNextReport(breakpadRef_, uploadTimeParameters_); BreakpadUploadNextReportWithParameters(breakpadRef_,
uploadTimeParameters_);
// If more reports must be sent, make sure this method is called again. // If more reports must be sent, make sure this method is called again.
if (BreakpadGetCrashReportCount(breakpadRef_) > 0) if (BreakpadGetCrashReportCount(breakpadRef_) > 0)