Skip to content

Commit 434f432

Browse files
johnislarryfacebook-github-bot
authored andcommitted
Meyers singleton jsc error extractor
Reviewed By: mhorowitz Differential Revision: D6554142 fbshipit-source-id: f586cd7030130e4ccb069f9aed8fb1364c527e54
1 parent 2d4bedb commit 434f432

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

ReactCommon/jschelpers/JSCHelpers.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,8 @@ void JSException::buildMessage(JSContextRef ctx, JSValueRef exn, JSStringRef sou
147147

148148
namespace ExceptionHandling {
149149

150-
#if __clang__
151-
#pragma clang diagnostic push
152-
#pragma clang diagnostic ignored "-Wglobal-constructors"
153-
#endif
154-
155150
PlatformErrorExtractor platformErrorExtractor;
156151

157-
#if __clang__
158-
#pragma clang diagnostic pop
159-
#endif
160-
161152
}
162153

163154
JSObjectRef makeFunction(

ReactCommon/jschelpers/JSCHelpers.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace ExceptionHandling {
5151
// method@filename[:line[:column]]
5252
std::string stack;
5353
};
54-
using PlatformErrorExtractor = std::function<ExtractedEror(const std::exception &ex, const char *context)>;
54+
typedef ExtractedEror(*PlatformErrorExtractor)(const std::exception &ex, const char *context);
5555
extern PlatformErrorExtractor platformErrorExtractor;
5656
}
5757

0 commit comments

Comments
 (0)