Merge pull request idaholab#5479 from dschwen/virtual_5478

Explicitly mark methods as virtual and restore access qualifiers
permcody · Jul 30, 2015 · 1d13028 · 1d13028
2 parents b4699f9 + 4453d8e
commit 1d13028
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/modules/richards/include/materials/PoroFullSatMaterial.h b/modules/richards/include/materials/PoroFullSatMaterial.h
@@ -90,9 +90,8 @@ class PoroFullSatMaterial : public DerivativeMaterialInterface<Material>
   /// d(1/M)/d(volumetric_strain)
   MaterialProperty<Real> & _done_over_biot_modulus_dep;
 
-  void initQpStatefulProperties();
-  void computeQpProperties();
-
+  virtual void initQpStatefulProperties();
+  virtual void computeQpProperties();
 };
 
 #endif //POROFULLSATMATERIAL_H
diff --git a/test/include/materials/DerivativeMaterialInterfaceTestClient.h b/test/include/materials/DerivativeMaterialInterfaceTestClient.h
@@ -30,9 +30,9 @@ class DerivativeMaterialInterfaceTestClient : public DerivativeMaterialInterface
 public:
   DerivativeMaterialInterfaceTestClient(const InputParameters & parameters);
 
-protected:
-  void computeProperties();
+  virtual void computeProperties();
 
+protected:
   MaterialPropertyName _prop_name;
   bool _by_name;
   const MaterialProperty<Real> & _prop0, & _prop1, & _prop2, & _prop3, & _prop4, & _prop5;

diff --git a/test/include/materials/DerivativeMaterialInterfaceTestProvider.h b/test/include/materials/DerivativeMaterialInterfaceTestProvider.h
@@ -30,9 +30,9 @@ class DerivativeMaterialInterfaceTestProvider : public DerivativeMaterialInterfa
 public:
   DerivativeMaterialInterfaceTestProvider(const InputParameters & parameters);
 
-protected:
-  void computeProperties();
+  virtual void computeProperties();
 
+protected:
   MaterialProperty<Real> & _prop1, & _prop2, & _prop3, & _prop4, & _prop5;
 };
 

diff --git a/test/include/materials/OutputTestMaterial.h b/test/include/materials/OutputTestMaterial.h
@@ -42,9 +42,8 @@ class OutputTestMaterial : public Material
    */
   virtual ~OutputTestMaterial();
 
-  void computeQpProperties();
-
 protected:
+  virtual void computeQpProperties();
 
   MaterialProperty<Real> & _real_property;
   MaterialProperty<RealVectorValue> & _vector_property;

diff --git a/test/include/materials/SumMaterial.h b/test/include/materials/SumMaterial.h
@@ -31,7 +31,7 @@ class SumMaterial : public Material
   virtual ~SumMaterial();
 
 protected:
-  void computeQpProperties();
+  virtual void computeQpProperties();
 
   std::string _sum_prop_name;
   std::string _mp1_prop_name;