From c43461ac5645d23f589f84e5cbd0dee55874a532 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Fri, 15 Nov 2019 08:49:07 -0800 Subject: [PATCH] src: make debug_options getters public This simplifies requires for those using DebugOptions, since debug_options was defined in src/node_options-inl.h and thus embedders would need to require an extra file to do what could trivially be consolidated into one. PR-URL: https://github.com/nodejs/node/pull/30494 Reviewed-By: Colin Ihrig Reviewed-By: Richard Lau Reviewed-By: David Carlier --- src/node_options-inl.h | 8 -------- src/node_options.h | 5 +++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/node_options-inl.h b/src/node_options-inl.h index 8fc2feff4dc6d4..8bb5b6155a21d1 100644 --- a/src/node_options-inl.h +++ b/src/node_options-inl.h @@ -13,14 +13,6 @@ PerIsolateOptions* PerProcessOptions::get_per_isolate_options() { return per_isolate.get(); } -DebugOptions* EnvironmentOptions::get_debug_options() { - return &debug_options_; -} - -const DebugOptions& EnvironmentOptions::debug_options() const { - return debug_options_; -} - EnvironmentOptions* PerIsolateOptions::get_per_env_options() { return per_env.get(); } diff --git a/src/node_options.h b/src/node_options.h index 7b3ae19fe6c8ad..c3ef78fd5bca0c 100644 --- a/src/node_options.h +++ b/src/node_options.h @@ -172,8 +172,9 @@ class EnvironmentOptions : public Options { std::vector user_argv; - inline DebugOptions* get_debug_options(); - inline const DebugOptions& debug_options() const; + inline DebugOptions* get_debug_options() { return &debug_options_; } + inline const DebugOptions& debug_options() const { return debug_options_; } + void CheckOptions(std::vector* errors) override; private: