summaryrefslogtreecommitdiff
path: root/src/env.h
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2018-07-27 00:10:46 +0200
committerAnna Henningsen <anna@addaleax.net>2018-08-05 02:08:51 +0200
commita196aa2e24ef7069289fa4a9aa8c6862d82e6b5f (patch)
tree0afac910a02db2fc3ae81d9d81206cb1f05cfade /src/env.h
parentf8d34b902e487f6bec0eb49967f9a37a19caccd3 (diff)
downloadandroid-node-v8-a196aa2e24ef7069289fa4a9aa8c6862d82e6b5f.tar.gz
android-node-v8-a196aa2e24ef7069289fa4a9aa8c6862d82e6b5f.tar.bz2
android-node-v8-a196aa2e24ef7069289fa4a9aa8c6862d82e6b5f.zip
src: clean up PackageConfig pseudo-boolean fields
PR-URL: https://github.com/nodejs/node/pull/21987 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Diffstat (limited to 'src/env.h')
-rw-r--r--src/env.h27
1 files changed, 10 insertions, 17 deletions
diff --git a/src/env.h b/src/env.h
index 820c3a7fc3..8e6da729c4 100644
--- a/src/env.h
+++ b/src/env.h
@@ -65,23 +65,15 @@ class Worker;
namespace loader {
class ModuleWrap;
-struct Exists {
- enum Bool { Yes, No };
-};
-
-struct IsValid {
- enum Bool { Yes, No };
-};
-
-struct HasMain {
- enum Bool { Yes, No };
-};
-
struct PackageConfig {
- const Exists::Bool exists;
- const IsValid::Bool is_valid;
- const HasMain::Bool has_main;
- const std::string main;
+ enum class Exists { Yes, No };
+ enum class IsValid { Yes, No };
+ enum class HasMain { Yes, No };
+
+ Exists exists;
+ IsValid is_valid;
+ HasMain has_main;
+ std::string main;
};
} // namespace loader
@@ -672,7 +664,8 @@ class Environment {
std::unordered_multimap<int, loader::ModuleWrap*> module_map;
- std::unordered_map<std::string, loader::PackageConfig> package_json_cache;
+ std::unordered_map<std::string, const loader::PackageConfig>
+ package_json_cache;
inline double* heap_statistics_buffer() const;
inline void set_heap_statistics_buffer(double* pointer);