Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: macOS bridge - inlined helpers are static too #1148

Merged
merged 6 commits into from
Jan 27, 2023
Merged

fix: macOS bridge - inlined helpers are static too #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84ad7e6
aligned NS_X_OrNil methods with iOS bridge
bitsandfoxes Jan 20, 2023
efabeeb
Updated CHANGELOG.md
bitsandfoxes Jan 20, 2023
fb1666e
typo
bitsandfoxes Jan 20, 2023
dea1d5f
Merge branch 'main' into fix/align-bridges
bitsandfoxes Jan 20, 2023
8658fa2
Merge branch 'fix/align-bridges' of https://github.com/getsentry/sent…
bitsandfoxes Jan 20, 2023
be89eed
Update CHANGELOG.md
bitsandfoxes Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Fixes

- Fixed conflicting default name for scriptable options configuration scripts ([#1146](https://github.com/getsentry/sentry-unity/pull/1146))
- Made inlined helpers on the macOS bridge static ([#1148](https://github.com/getsentry/sentry-unity/pull/1148))

### Dependencies

Expand Down
9 changes: 6 additions & 3 deletions package-dev/Plugins/macOS/SentryNativeBridge.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,17 @@ void SentryNativeBridgeUnsetUser()
return cString;
}

inline NSString *_NSStringOrNil(const char *value)
static inline NSString *_NSStringOrNil(const char *value)
{
return value ? [NSString stringWithUTF8String:value] : nil;
}

inline NSString *_NSNumberOrNil(int32_t value) { return value == 0 ? nil : @(value); }
static inline NSString *_NSNumberOrNil(int32_t value)
{
return value == 0 ? nil : @(value);
}

inline NSNumber *_NSBoolOrNil(int8_t value)
static inline NSNumber *_NSBoolOrNil(int8_t value)
{
if (value == 0) {
return @NO;
Expand Down