From d83de7eef47aaf53597229bdb154d84078dbbb64 Mon Sep 17 00:00:00 2001 From: cignoni Date: Sat, 5 Jul 2008 23:35:06 +0000 Subject: [PATCH] Small modifications to compile with gcc >4.3 (thanks to Carlo Casta!) --- vcg/container/simple_temporary_data.h | 1 + vcg/simplex/vertexplus/component.h | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/vcg/container/simple_temporary_data.h b/vcg/container/simple_temporary_data.h index 18ec0c9d..b21cc9a3 100644 --- a/vcg/container/simple_temporary_data.h +++ b/vcg/container/simple_temporary_data.h @@ -48,6 +48,7 @@ First Working Release (with this comment) #ifndef __VCGLIB_SIMPLE__ #define __VCGLIB_SIMPLE__ +#include #include namespace vcg { diff --git a/vcg/simplex/vertexplus/component.h b/vcg/simplex/vertexplus/component.h index 6699e87d..629cb4f2 100644 --- a/vcg/simplex/vertexplus/component.h +++ b/vcg/simplex/vertexplus/component.h @@ -116,6 +116,7 @@ First working version! #ifndef __VCG_VERTEX_PLUS_COMPONENT #define __VCG_VERTEX_PLUS_COMPONENT #include +#include #include #include #include @@ -406,17 +407,17 @@ public: static void Name(std::vector & name){name.push_back(std::st /*-------------------------- Curvature Direction ----------------------------------*/ template -struct CurvatureDirType{ +struct CurvatureDirBaseType{ typedef Point3 VecType; typedef S ScalarType; - CurvatureDirType () {} + CurvatureDirBaseType () {} Point3max_dir,min_dir; // max and min curvature direction S k1,k2;// max and min curvature values }; template class EmptyCurvatureDir: public TT { public: - typedef CurvatureDirType CurvatureDirType; + typedef CurvatureDirBaseType CurvatureDirType; Point3f &PD1(){static Point3f dummy(0,0,0); return dummy;} Point3f &PD2(){static Point3f dummy(0,0,0); return dummy;} @@ -456,10 +457,10 @@ private: }; -template class CurvatureDirf: public CurvatureDir, T> { +template class CurvatureDirf: public CurvatureDir, T> { public: static void Name(std::vector & name){name.push_back(std::string("CurvatureDirf"));T::Name(name);} }; -template class CurvatureDird: public CurvatureDir, T> { +template class CurvatureDird: public CurvatureDir, T> { public: static void Name(std::vector & name){name.push_back(std::string("CurvatureDird"));T::Name(name);} };