From 1d7687efb2bb8785b6a2a2f620d05fe1cb84f922 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 15 Jun 2018 17:58:00 -0400
Subject: [PATCH] SL-821: Fix up Objective-C++ syntax errors.
---
indra/newview/llappdelegate-objc.mm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm
index ad5398721be..008203fd321 100644
--- a/indra/newview/llappdelegate-objc.mm
+++ b/indra/newview/llappdelegate-objc.mm
@@ -190,13 +190,15 @@
return true;
}
+@end
+
#if defined(LL_BUGSPLAT)
@implementation BugsplatStartupManagerDelegate
- (BugsplatAttachment *)attachmentForBugsplatStartupManager:(BugsplatStartupManager *)bugsplatStartupManager {
std::string logfile = getLogFilePathname();
- NSString *ns_logfile = [NSString stringWithCString:logfile->c_str()
+ NSString *ns_logfile = [NSString stringWithCString:logfile.c_str()
encoding:NSUTF8StringEncoding];
NSData *data = [NSData dataWithContentsOfFile:ns_logfile];
@@ -209,6 +211,6 @@
return attachment;
}
-#endif // LL_BUGSPLAT
-
@end
+
+#endif // LL_BUGSPLAT
--
GitLab