Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-09 14:38:57 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-15 15:53:03 (GMT) |
| commit | f7de41c770be1bc6c45e825ff0fbdd6bfb799fae (patch) | |
| tree | 60f7802290dd1d06399f7a7c59fa621046321e18 /SwifTools/Notifier/NotificationCenterNotifierDelegate.mm | |
| parent | 8cdebcff1d1e8321b070c7e675f9a9709a2b0b81 (diff) | |
| download | swift-f7de41c770be1bc6c45e825ff0fbdd6bfb799fae.zip swift-f7de41c770be1bc6c45e825ff0fbdd6bfb799fae.tar.bz2 | |
Explicitly convert between nullable and non-nullable on OS X
Clang was complaining about implicit conversions between
nullable and non-nullable NSString pointers. Adjusted our
std::string -> NSString* conversion utilities to check for
nil and return an empty std::string in that case.
Replaced uses of [NSString stringWithUTF8String] with our
STD2NSSTRING macro.
Turned std::string <-> NSString* conversion macros into
functions.
Test-Information:
Builds without the warning on OS X 10.11.3 and Swift runs
without issues.
Change-Id: I949f2f3332018391aead58ef362764f4b7955b01
Diffstat (limited to 'SwifTools/Notifier/NotificationCenterNotifierDelegate.mm')
| -rw-r--r-- | SwifTools/Notifier/NotificationCenterNotifierDelegate.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SwifTools/Notifier/NotificationCenterNotifierDelegate.mm b/SwifTools/Notifier/NotificationCenterNotifierDelegate.mm index 617619c..2b1c2a4 100644 --- a/SwifTools/Notifier/NotificationCenterNotifierDelegate.mm +++ b/SwifTools/Notifier/NotificationCenterNotifierDelegate.mm @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Isode Limited. + * Copyright (c) 2015-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -19,7 +19,7 @@ using namespace Swift; - (void)userNotificationCenter:(NSUserNotificationCenter *) center didActivateNotification:(NSUserNotification *)notification { (void)center; - std::string identifier = NS2STDSTRING(notification.identifier); + std::string identifier = ns2StdString(notification.identifier); notifier->handleUserNotificationActivated(identifier); } |