From a196aa2e24ef7069289fa4a9aa8c6862d82e6b5f Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Fri, 27 Jul 2018 00:10:46 +0200
Subject: 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>
---
 src/env.h | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'src/env.h')

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);
-- 
cgit v1.2.3