aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2019-05-17 13:11:02 -0700
committerMichaƫl Zasso <targos@protonmail.com>2019-05-28 07:33:28 +0200
commit02f794a53f98dc372c972e67aa592dd0ba758ea4 (patch)
treeee704d1b98c5ed0dd39f7effe57be6f5da36bec1
parent940577bd76766e9860ee4c6907c0c0bb689eecf4 (diff)
downloadandroid-node-v8-02f794a53f98dc372c972e67aa592dd0ba758ea4.tar.gz
android-node-v8-02f794a53f98dc372c972e67aa592dd0ba758ea4.tar.bz2
android-node-v8-02f794a53f98dc372c972e67aa592dd0ba758ea4.zip
src: remove memory_tracker-inl.h from header files
Inline headers should only be included into the .cc files that use them. PR-URL: https://github.com/nodejs/node/pull/27755 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
-rw-r--r--src/base_object.h2
-rw-r--r--src/cares_wrap.cc1
-rw-r--r--src/env.cc1
-rw-r--r--src/heap_utils.cc1
-rw-r--r--src/inspector_js_api.cc1
-rw-r--r--src/inspector_profiler.cc1
-rw-r--r--src/module_wrap.cc1
-rw-r--r--src/node.cc1
-rw-r--r--src/node_config.cc1
-rw-r--r--src/node_contextify.cc1
-rw-r--r--src/node_crypto.cc1
-rw-r--r--src/node_crypto_bio.cc1
-rw-r--r--src/node_file.cc1
-rw-r--r--src/node_http2.cc1
-rw-r--r--src/node_http_parser_llhttp.cc1
-rw-r--r--src/node_http_parser_traditional.cc1
-rw-r--r--src/node_messaging.cc1
-rw-r--r--src/node_perf.cc1
-rw-r--r--src/node_stat_watcher.cc1
-rw-r--r--src/node_trace_events.cc1
-rw-r--r--src/node_worker.cc1
-rw-r--r--src/node_zlib.cc1
-rw-r--r--src/tls_wrap.cc1
23 files changed, 23 insertions, 1 deletions
diff --git a/src/base_object.h b/src/base_object.h
index cb83462ff5..f616108a1d 100644
--- a/src/base_object.h
+++ b/src/base_object.h
@@ -24,7 +24,7 @@
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
-#include "memory_tracker-inl.h"
+#include "memory_tracker.h"
#include "v8.h"
#include <type_traits> // std::remove_reference
diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
index 07882a4212..0be02596f9 100644
--- a/src/cares_wrap.cc
+++ b/src/cares_wrap.cc
@@ -23,6 +23,7 @@
#include "ares.h"
#include "async_wrap-inl.h"
#include "env-inl.h"
+#include "memory_tracker-inl.h"
#include "node.h"
#include "req_wrap-inl.h"
#include "util-inl.h"
diff --git a/src/env.cc b/src/env.cc
index 5f408f18f1..bc43fac963 100644
--- a/src/env.cc
+++ b/src/env.cc
@@ -1,6 +1,7 @@
#include "env.h"
#include "async_wrap.h"
+#include "memory_tracker-inl.h"
#include "node_buffer.h"
#include "node_context_data.h"
#include "node_errors.h"
diff --git a/src/heap_utils.cc b/src/heap_utils.cc
index ee0665cfe2..acc63fd1d9 100644
--- a/src/heap_utils.cc
+++ b/src/heap_utils.cc
@@ -1,4 +1,5 @@
#include "env-inl.h"
+#include "memory_tracker-inl.h"
#include "stream_base-inl.h"
#include "util-inl.h"
diff --git a/src/inspector_js_api.cc b/src/inspector_js_api.cc
index 5caf3fa09a..9d64938570 100644
--- a/src/inspector_js_api.cc
+++ b/src/inspector_js_api.cc
@@ -1,6 +1,7 @@
#include "base_object-inl.h"
#include "inspector_agent.h"
#include "inspector_io.h"
+#include "memory_tracker-inl.h"
#include "util-inl.h"
#include "v8.h"
#include "v8-inspector.h"
diff --git a/src/inspector_profiler.cc b/src/inspector_profiler.cc
index 4604e0a5b4..7e76ad778a 100644
--- a/src/inspector_profiler.cc
+++ b/src/inspector_profiler.cc
@@ -2,6 +2,7 @@
#include <sstream>
#include "base_object-inl.h"
#include "debug_utils.h"
+#include "memory_tracker-inl.h"
#include "node_file.h"
#include "node_internals.h"
#include "v8-inspector.h"
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index a4e81dcc29..e104afb736 100644
--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
@@ -1,6 +1,7 @@
#include "module_wrap.h"
#include "env.h"
+#include "memory_tracker-inl.h"
#include "node_errors.h"
#include "node_url.h"
#include "util-inl.h"
diff --git a/src/node.cc b/src/node.cc
index 1e7c467d9c..f8b6fa6f33 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -25,6 +25,7 @@
#include "debug_utils.h"
#include "env-inl.h"
+#include "memory_tracker-inl.h"
#include "node_binding.h"
#include "node_internals.h"
#include "node_main_instance.h"
diff --git a/src/node_config.cc b/src/node_config.cc
index 335ebedc58..92985dff2f 100644
--- a/src/node_config.cc
+++ b/src/node_config.cc
@@ -1,4 +1,5 @@
#include "env-inl.h"
+#include "memory_tracker.h"
#include "node.h"
#include "node_i18n.h"
#include "node_native_module_env.h"
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 77622f8cbd..ee5a9db574 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -21,6 +21,7 @@
#include "node_contextify.h"
+#include "memory_tracker-inl.h"
#include "node_internals.h"
#include "node_watchdog.h"
#include "base_object-inl.h"
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index f38ed3907d..76a8cc8a19 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -32,6 +32,7 @@
#include "async_wrap-inl.h"
#include "base_object-inl.h"
#include "env-inl.h"
+#include "memory_tracker-inl.h"
#include "string_bytes.h"
#include "threadpoolwork-inl.h"
#include "util-inl.h"
diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc
index fcbe30ca9c..9f06801c3a 100644
--- a/src/node_crypto_bio.cc
+++ b/src/node_crypto_bio.cc
@@ -20,6 +20,7 @@
// USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "base_object-inl.h"
+#include "memory_tracker-inl.h"
#include "node_crypto_bio.h"
#include "openssl/bio.h"
#include "util-inl.h"
diff --git a/src/node_file.cc b/src/node_file.cc
index 4da2a4f53c..8f82d639d6 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -21,6 +21,7 @@
#include "node_file.h"
#include "aliased_buffer.h"
+#include "memory_tracker-inl.h"
#include "node_buffer.h"
#include "node_process.h"
#include "node_stat_watcher.h"
diff --git a/src/node_http2.cc b/src/node_http2.cc
index 0c650290c2..d9b886284d 100644
--- a/src/node_http2.cc
+++ b/src/node_http2.cc
@@ -1,5 +1,6 @@
#include "aliased_buffer.h"
#include "debug_utils.h"
+#include "memory_tracker-inl.h"
#include "node.h"
#include "node_buffer.h"
#include "node_http2.h"
diff --git a/src/node_http_parser_llhttp.cc b/src/node_http_parser_llhttp.cc
index d2063873f1..6e1d18d3af 100644
--- a/src/node_http_parser_llhttp.cc
+++ b/src/node_http_parser_llhttp.cc
@@ -1,6 +1,7 @@
#define NODE_EXPERIMENTAL_HTTP 1
#include "node_http_parser_impl.h"
+#include "memory_tracker-inl.h"
#include "node_metadata.h"
#include "util-inl.h"
diff --git a/src/node_http_parser_traditional.cc b/src/node_http_parser_traditional.cc
index 7b413af8b6..11aa387f10 100644
--- a/src/node_http_parser_traditional.cc
+++ b/src/node_http_parser_traditional.cc
@@ -2,6 +2,7 @@
#undef NODE_EXPERIMENTAL_HTTP
#endif
+#include "memory_tracker-inl.h"
#include "node_http_parser_impl.h"
#include "node_metadata.h"
#include "util-inl.h"
diff --git a/src/node_messaging.cc b/src/node_messaging.cc
index ea7b48779c..fa583a2570 100644
--- a/src/node_messaging.cc
+++ b/src/node_messaging.cc
@@ -2,6 +2,7 @@
#include "async_wrap-inl.h"
#include "debug_utils.h"
+#include "memory_tracker-inl.h"
#include "node_contextify.h"
#include "node_buffer.h"
#include "node_errors.h"
diff --git a/src/node_perf.cc b/src/node_perf.cc
index 0863202030..f43c102136 100644
--- a/src/node_perf.cc
+++ b/src/node_perf.cc
@@ -1,4 +1,5 @@
#include "aliased_buffer.h"
+#include "memory_tracker-inl.h"
#include "node_internals.h"
#include "node_perf.h"
#include "node_buffer.h"
diff --git a/src/node_stat_watcher.cc b/src/node_stat_watcher.cc
index b7fb45900f..ae30825cbb 100644
--- a/src/node_stat_watcher.cc
+++ b/src/node_stat_watcher.cc
@@ -19,6 +19,7 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
+#include "memory_tracker-inl.h"
#include "node_stat_watcher.h"
#include "async_wrap-inl.h"
#include "env.h"
diff --git a/src/node_trace_events.cc b/src/node_trace_events.cc
index 13072a3340..24e1d66fb7 100644
--- a/src/node_trace_events.cc
+++ b/src/node_trace_events.cc
@@ -1,5 +1,6 @@
#include "base_object-inl.h"
#include "env.h"
+#include "memory_tracker-inl.h"
#include "node.h"
#include "node_internals.h"
#include "node_v8_platform-inl.h"
diff --git a/src/node_worker.cc b/src/node_worker.cc
index 20b883664d..e84b36f132 100644
--- a/src/node_worker.cc
+++ b/src/node_worker.cc
@@ -1,5 +1,6 @@
#include "node_worker.h"
#include "debug_utils.h"
+#include "memory_tracker-inl.h"
#include "node_errors.h"
#include "node_buffer.h"
#include "node_options-inl.h"
diff --git a/src/node_zlib.cc b/src/node_zlib.cc
index d816c7caff..30fef0ff1d 100644
--- a/src/node_zlib.cc
+++ b/src/node_zlib.cc
@@ -19,6 +19,7 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
+#include "memory_tracker-inl.h"
#include "node.h"
#include "node_buffer.h"
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index a1944df056..69293ad906 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -22,6 +22,7 @@
#include "tls_wrap.h"
#include "async_wrap-inl.h"
#include "debug_utils.h"
+#include "memory_tracker-inl.h"
#include "node_buffer.h" // Buffer
#include "node_crypto.h" // SecureContext
#include "node_crypto_bio.h" // NodeBIO