9a7426dc25
This points our node repo at upstream (nodejs/node) and uses the base node tag as the target ref. We then use our existing patch system and patch files to apply our changes on top of node. This unifies how we patch upstream repos and makes our node patches easier to reason, view, understand and most importantly reduce.
20 lines
933 B
Diff
20 lines
933 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 30 Jul 2018 13:08:34 -0700
|
|
Subject: fix: expose TraceEventHelper
|
|
|
|
Node required tracing controller to be initialized, otherwise a crash would occur. Changed in concert with https://github.com/electron/electron/commit/0e5b6f93000e4718c9e35332ddbd0f6b76cdd585\#diff-0cdfa12fff513e022fac830c6af9c19a
|
|
|
|
diff --git a/src/tracing/trace_event.h b/src/tracing/trace_event.h
|
|
index 590cb592fc054f90ffc85052985087db6c3c3463..4a398106d77e5e0f7c16448fa952c637833cfede 100644
|
|
--- a/src/tracing/trace_event.h
|
|
+++ b/src/tracing/trace_event.h
|
|
@@ -310,7 +310,7 @@ const int kZeroNumArgs = 0;
|
|
const decltype(nullptr) kGlobalScope = nullptr;
|
|
const uint64_t kNoId = 0;
|
|
|
|
-class TraceEventHelper {
|
|
+class NODE_EXTERN TraceEventHelper {
|
|
public:
|
|
static TracingController* GetTracingController();
|
|
static Agent* GetAgent();
|