From 565036df80f64f22c7ea43e6124d043aa8216cbf Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Wed, 28 Sep 2016 14:37:48 +0200
Subject: [PATCH] postfix the arguments with underscore to avoid declaration
shadows
---
MaterialLib/FractureModels/LinearElasticIsotropic.h | 4 ++--
MaterialLib/FractureModels/MohrCoulomb.h | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/MaterialLib/FractureModels/LinearElasticIsotropic.h b/MaterialLib/FractureModels/LinearElasticIsotropic.h
index df8ec5231f4..c236be4e10b 100644
--- a/MaterialLib/FractureModels/LinearElasticIsotropic.h
+++ b/MaterialLib/FractureModels/LinearElasticIsotropic.h
@@ -31,8 +31,8 @@ public:
using P = ProcessLib::Parameter<double>;
using X = ProcessLib::SpatialPosition;
- MaterialProperties(P const& normal_stiffness, P const& shear_stiffness)
- : normal_stiffness(normal_stiffness), shear_stiffness(shear_stiffness)
+ MaterialProperties(P const& normal_stiffness_, P const& shear_stiffness_)
+ : normal_stiffness(normal_stiffness_), shear_stiffness(shear_stiffness_)
{
}
diff --git a/MaterialLib/FractureModels/MohrCoulomb.h b/MaterialLib/FractureModels/MohrCoulomb.h
index 017e96e60c7..cd7d974ace5 100644
--- a/MaterialLib/FractureModels/MohrCoulomb.h
+++ b/MaterialLib/FractureModels/MohrCoulomb.h
@@ -32,12 +32,12 @@ public:
using X = ProcessLib::SpatialPosition;
MaterialProperties(
- P const& normal_stiffness, P const& shear_stiffness,
- P const& friction_angle, P const& dilatancy_angle,
- P const& cohesion)
- : normal_stiffness(normal_stiffness), shear_stiffness(shear_stiffness),
- friction_angle(friction_angle), dilatancy_angle(dilatancy_angle),
- cohesion(cohesion)
+ P const& normal_stiffness_, P const& shear_stiffness_,
+ P const& friction_angle_, P const& dilatancy_angle_,
+ P const& cohesion_)
+ : normal_stiffness(normal_stiffness_), shear_stiffness(shear_stiffness_),
+ friction_angle(friction_angle_), dilatancy_angle(dilatancy_angle_),
+ cohesion(cohesion_)
{
}
--
GitLab