diff --git a/vcg/complex/algorithms/create/platonic.h b/vcg/complex/algorithms/create/platonic.h index 8b4d906e..386bcff1 100644 --- a/vcg/complex/algorithms/create/platonic.h +++ b/vcg/complex/algorithms/create/platonic.h @@ -639,11 +639,11 @@ void Torus(MeshType &m, float hRingRadius, float vRingRadius, int hRingDiv=24, i template static ScalarType _SQfnC(ScalarType a, ScalarType b){ return math::Sgn(cos(a))*pow(fabs(cos(a)),b); -}; +} template static ScalarType _SQfnS(ScalarType a, ScalarType b){ return math::Sgn(sin(a))*pow(fabs(sin(a)),b); -}; +} /** diff --git a/vcg/complex/used_types.h b/vcg/complex/used_types.h index 570dd1ce..61060a2b 100755 --- a/vcg/complex/used_types.h +++ b/vcg/complex/used_types.h @@ -119,6 +119,6 @@ struct _Face : public Face<_UsedTypes>{}; struct _Tetra : public TetraSimp<_UsedTypes>{}; struct _HEdge : public HEdge<_UsedTypes>{}; -}; +} #endif // USED_TYPES_H diff --git a/vcg/space/intersection3.h b/vcg/space/intersection3.h index e6cc96ae..e0fcadd2 100644 --- a/vcg/space/intersection3.h +++ b/vcg/space/intersection3.h @@ -121,7 +121,7 @@ namespace vcg { solution_count++; } return solution_count; - }; // end of IntersectionSegmentSphere + } // end of IntersectionSegmentSphere /*! @@ -214,7 +214,7 @@ namespace vcg { penetration_detected = (witness.SquaredNorm() <= (radius*radius)); witness += center; return penetration_detected; - }; //end of IntersectionSphereTriangle + } //end of IntersectionSphereTriangle /// intersection between line and plane template diff --git a/vcg/space/tetra3.h b/vcg/space/tetra3.h index cd702b31..4f07b145 100644 --- a/vcg/space/tetra3.h +++ b/vcg/space/tetra3.h @@ -379,7 +379,7 @@ class Tetra CoordType n1 = ((p2 - p0) ^ (p1 - p0)).normalized(); return M_PI - double(acos(n0 * n1)); - }; + } template static typename TetraType::ScalarType SolidAngle(const TetraType &t, const size_t vidx) @@ -390,7 +390,7 @@ class Tetra ScalarType a2 = DihedralAngle(t, Tetra::EofV(vidx, 2)); return (a0 + a1 + a2) - M_PI; - }; + } template static typename TetraType::ScalarType AspectRatio(const TetraType &t) diff --git a/wrap/gl/deprecated_space.h b/wrap/gl/deprecated_space.h index 563032cc..7478b859 100644 --- a/wrap/gl/deprecated_space.h +++ b/wrap/gl/deprecated_space.h @@ -152,7 +152,7 @@ namespace vcg { glVertex3f((float)b.min[0],(float)b.max[1],(float)b.max[2]); glEnd(); glPopAttrib(); -}; +} template /// Funzione di utilita' per la visualizzazione in OpenGL (flat shaded) inline void glBoxFlat(Box3 const & b) @@ -190,7 +190,7 @@ inline void glBoxFlat(Box3 const & b) glVertex3f(b.min[0], b.min[1], b.max[2]); glEnd(); glPopAttrib(); -}; +} template @@ -228,7 +228,7 @@ inline void glBoxClip(const Box3 & b) glEnd(); glPopAttrib(); -}; +} template inline void glPlane3( Plane3 p, Point3 c, T size ) { Point3 w = p.Direction(); diff --git a/wrap/system/memory_info.h b/wrap/system/memory_info.h index 517f49e7..884ccc31 100644 --- a/wrap/system/memory_info.h +++ b/wrap/system/memory_info.h @@ -112,6 +112,6 @@ namespace vcg return (_currentfreememory >= mem); } }; -}; +} -#endif \ No newline at end of file +#endif