Meyers singleton jsc error extractor

Reviewed By: mhorowitz Differential Revision: D6554142 fbshipit-source-id: f586cd7030130e4ccb069f9aed8fb1364c527e54
facebook · Dec 13, 2017 · 434f432 · 434f432
1 parent 2d4bedb
commit 434f432
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/ReactCommon/jschelpers/JSCHelpers.cpp b/ReactCommon/jschelpers/JSCHelpers.cpp
@@ -147,17 +147,8 @@ void JSException::buildMessage(JSContextRef ctx, JSValueRef exn, JSStringRef sou
 
 namespace ExceptionHandling {
 
-#if __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
 PlatformErrorExtractor platformErrorExtractor;
 
-#if __clang__
-#pragma clang diagnostic pop
-#endif
-
 }
 
 JSObjectRef makeFunction(

diff --git a/ReactCommon/jschelpers/JSCHelpers.h b/ReactCommon/jschelpers/JSCHelpers.h
@@ -51,7 +51,7 @@ namespace ExceptionHandling {
     // method@filename[:line[:column]]
     std::string stack;
   };
-  using PlatformErrorExtractor = std::function<ExtractedEror(const std::exception &ex, const char *context)>;
+  typedef ExtractedEror(*PlatformErrorExtractor)(const std::exception &ex, const char *context);
   extern PlatformErrorExtractor platformErrorExtractor;
 }