default package id in resource class

nuclearkatie · Feb 26, 2024 · fef853f · fef853f
1 parent 38ea3d9
commit fef853f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/src/material.cc b/src/material.cc
@@ -12,8 +12,6 @@ namespace cyclus {
 
 const ResourceType Material::kType = "Material";
 
-static int default_package_id_ = 1;
-
 Material::~Material() {}
 
 Material::Ptr Material::Create(Agent* creator, double quantity,

diff --git a/src/product.cc b/src/product.cc
@@ -9,7 +9,6 @@ const ResourceType Product::kType = "Product";
 
 std::map<std::string, int> Product::qualids_;
 int Product::next_qualid_ = 1;
-static int default_package_id_ = 1;
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 Product::Ptr Product::Create(Agent* creator, double quantity,

diff --git a/src/resource.h b/src/resource.h
@@ -79,6 +79,8 @@ class Resource {
   /// @return a new resource object with same state id and quantity == quantity
   virtual Ptr ExtractRes(double quantity) = 0;
 
+ protected:
+  const static int default_package_id_ = 1;
  private:
   static int nextstate_id_;
   static int nextobj_id_;