fix virtuals

nuclearkatie · Feb 28, 2024 · 4937f93 · 4937f93
1 parent 3213380
commit 4937f93
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/material.cc b/src/material.cc
@@ -154,7 +154,7 @@ void Material::ChangePackageId(int new_package_id) {
     package_id_ = new_package_id;
     return;
   }
-  
+
   Package::Ptr p = ctx_->GetPackageById(package_id_);
   double min = p->fill_min();
   double max = p->fill_max();

diff --git a/src/material.h b/src/material.h
@@ -153,12 +153,11 @@ class Material: public Resource {
   /// DEPRECATED - use non-const comp() function.
   Composition::Ptr comp() const;
 
-  /// Returns the package id.
-  virtual int package_id();
+  int package_id();
 
   /// Changes the package id. Checks that the resource fits the package 
   /// type minimum and maximum mass criteria.
-  virtual void ChangePackageId(int new_package_id = default_package_id_);
+  void ChangePackageId(int new_package_id = default_package_id_);
 
  protected:
   Material(Context* ctx, double quantity, Composition::Ptr c, int package_id = default_package_id_);

diff --git a/src/product.cc b/src/product.cc
@@ -73,6 +73,10 @@ Resource::Ptr Product::ExtractRes(double qty) {
   return boost::static_pointer_cast<Resource>(Extract(qty));
 }
 
+int Product::package_id() {
+  return package_id_;
+}
+
 void Product::ChangePackageId(int new_package_id) {
   if (ctx_ != NULL) {
     throw ValueError("Package Id cannot be changed with NULL context");

diff --git a/src/product.h b/src/product.h
@@ -71,6 +71,9 @@ class Product : public Resource {
   /// @throws ValueError 'other' resource is of different quality
   void Absorb(Product::Ptr other);
 
+  // Returns the package id.
+  int package_id();
+
   /// Changes the product's package id
   void ChangePackageId(int new_package_id);