From da79381c1ba9d854f5ac0159b8848671415be82d Mon Sep 17 00:00:00 2001 From: Frank Gaede <frank.gaede@desy.de> Date: Fri, 23 May 2014 11:28:40 +0000 Subject: [PATCH] - fixed compile issue on SL5/6 with ambigious typedef for Material --- DDRec/include/DDRec/MaterialManager.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DDRec/include/DDRec/MaterialManager.h b/DDRec/include/DDRec/MaterialManager.h index 4d033da82..688861bc3 100644 --- a/DDRec/include/DDRec/MaterialManager.h +++ b/DDRec/include/DDRec/MaterialManager.h @@ -14,7 +14,8 @@ class TGeoManager ; namespace DD4hep { namespace DDRec { - typedef Geometry::Material Material ; + // export Geometry::Material to this namespace ; + using Geometry::Material ; typedef std::vector< std::pair< Material, double > > MaterialVec ; -- GitLab