diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-06-15 17:58:00 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-06-15 17:58:00 -0400 |
| commit | 1d7687efb2bb8785b6a2a2f620d05fe1cb84f922 (patch) | |
| tree | e84414956d7216bf4a58da0349ab5ca0d6eb8b43 /indra | |
| parent | 448e82f39c472c82620bb52e0644e258b363d562 (diff) | |
SL-821: Fix up Objective-C++ syntax errors.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappdelegate-objc.mm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llappdelegate-objc.mm b/indra/newview/llappdelegate-objc.mm index ad5398721b..008203fd32 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 |