From 0c18b07255d8374d76a61db14c3db551951d6482 Mon Sep 17 00:00:00 2001
From: dmaclach <dmaclach@4c0a9323-5329-0410-9bdc-e9ce6186880e>
Date: Tue, 18 Feb 2014 21:34:43 +0000
Subject: When the Breakpad.h header gets compiled by standard C compilers
 (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
---
 src/client/ios/Breakpad.h            | 9 ++++++---
 src/client/ios/Breakpad.mm           | 9 +++++++--
 src/client/ios/BreakpadController.mm | 3 ++-
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'src/client')

diff --git a/src/client/ios/Breakpad.h b/src/client/ios/Breakpad.h
index c3362b0f..9d212f70 100644
--- a/src/client/ios/Breakpad.h
+++ b/src/client/ios/Breakpad.h
@@ -200,9 +200,12 @@ void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key);
 int BreakpadGetCrashReportCount(BreakpadRef ref);
 
 // Upload next report to the server.
-// |server_parameters| is additional server parameters to send (optional).
-void BreakpadUploadNextReport(BreakpadRef ref,
-                              NSDictionary *server_parameters = nil);
+void BreakpadUploadNextReport(BreakpadRef ref);
+
+// 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.
 // |server_parameters| is additional server parameters to send.
diff --git a/src/client/ios/Breakpad.mm b/src/client/ios/Breakpad.mm
index 2bd7e33b..36d82d36 100644
--- a/src/client/ios/Breakpad.mm
+++ b/src/client/ios/Breakpad.mm
@@ -789,8 +789,13 @@ int BreakpadGetCrashReportCount(BreakpadRef ref) {
 }
 
 //=============================================================================
-void BreakpadUploadNextReport(BreakpadRef ref,
-                              NSDictionary *server_parameters) {
+void BreakpadUploadNextReport(BreakpadRef ref) {
+  BreakpadUploadNextReportWithParameters(ref, nil);
+}
+
+//=============================================================================
+void BreakpadUploadNextReportWithParameters(BreakpadRef ref,
+                                            NSDictionary *server_parameters) {
   try {
     // Not called at exception time
     Breakpad *breakpad = (Breakpad *)ref;
diff --git a/src/client/ios/BreakpadController.mm b/src/client/ios/BreakpadController.mm
index 4571470d..94d93d60 100644
--- a/src/client/ios/BreakpadController.mm
+++ b/src/client/ios/BreakpadController.mm
@@ -300,7 +300,8 @@ NSString* GetPlatform() {
       // A report can be sent now.
       if (timeToWait == 0) {
         [self reportWillBeSent];
-        BreakpadUploadNextReport(breakpadRef_, uploadTimeParameters_);
+        BreakpadUploadNextReportWithParameters(breakpadRef_,
+                                               uploadTimeParameters_);
 
         // If more reports must be sent, make sure this method is called again.
         if (BreakpadGetCrashReportCount(breakpadRef_) > 0)
-- 
cgit v1.2.1