keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/fixWarningsInAnalyticsMacros'

Browse Source
pull/1/head
Matthew Chen 8 years ago
parent 240b8adbd6 bdb50552d3
commit b6cecd44a8
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File

16
SignalServiceKit/src/Util/Asserts.h
Unescape Escape View File

@ -46,12 +46,28 @@
NSCAssert(0, formattedMessage); \ NSCAssert(0, formattedMessage); \
} }
#define OWSFailNoFormat(message) \
{ \
DDLogError(@"%s %@", __PRETTY_FUNCTION__, message); \
[DDLog flushLog]; \
NSAssert(0, message); \
}
#define OWSCFailNoFormat(message) \
{ \
DDLogError(@"%s %@", __PRETTY_FUNCTION__, message); \
[DDLog flushLog]; \
NSCAssert(0, message); \
}
#else #else
#define OWSAssert(X) #define OWSAssert(X)
#define OWSCAssert(X) #define OWSCAssert(X)
#define OWSFail(message, ...) #define OWSFail(message, ...)
#define OWSCFail(message, ...) #define OWSCFail(message, ...)
#define OWSFailNoFormat(X)
#define OWSCFailNoFormat(X)
#endif #endif

4
SignalServiceKit/src/Util/OWSAnalytics.h
Unescape Escape View File

@ -92,9 +92,9 @@ typedef NSDictionary<NSString *, id> *_Nonnull (^OWSProdAssertParametersBlock)()
} }
#define OWSProdFailWParams(__eventName, __parametersBlock) \ #define OWSProdFailWParams(__eventName, __parametersBlock) \
OWSProdFailWParamsTemplate(__eventName, __parametersBlock, OWSFail) OWSProdFailWParamsTemplate(__eventName, __parametersBlock, OWSFailNoFormat)
#define OWSProdCFailWParams(__eventName, __parametersBlock) \ #define OWSProdCFailWParams(__eventName, __parametersBlock) \
OWSProdFailWParamsTemplate(__eventName, __parametersBlock, OWSCFail) OWSProdFailWParamsTemplate(__eventName, __parametersBlock, OWSCFailNoFormat)
#define OWSProdFail(__eventName) OWSProdFailWParams(__eventName, nil) #define OWSProdFail(__eventName) OWSProdFailWParams(__eventName, nil)

Write Preview
Loading…
Cancel
Save