manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small modifications to compile with gcc >4.3 (thanks to Carlo Casta!)

This commit is contained in:
Paolo Cignoni 2008-07-05 23:35:06 +00:00
parent 9c314b7f2f
commit d83de7eef4
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vcg/container/simple_temporary_data.h
View File

@ -48,6 +48,7 @@ First Working Release (with this comment)
#ifndef __VCGLIB_SIMPLE__ #ifndef __VCGLIB_SIMPLE__
#define __VCGLIB_SIMPLE__ #define __VCGLIB_SIMPLE__
#include <limits>
#include <vector> #include <vector>
namespace vcg { namespace vcg {

11
vcg/simplex/vertexplus/component.h
View File

@ -116,6 +116,7 @@ First working version!
#ifndef __VCG_VERTEX_PLUS_COMPONENT #ifndef __VCG_VERTEX_PLUS_COMPONENT
#define __VCG_VERTEX_PLUS_COMPONENT #define __VCG_VERTEX_PLUS_COMPONENT
#include <vector> #include <vector>
#include <string>
#include <vcg/space/point3.h> #include <vcg/space/point3.h>
#include <vcg/space/texcoord2.h> #include <vcg/space/texcoord2.h>
#include <vcg/space/color4.h> #include <vcg/space/color4.h>
@ -406,17 +407,17 @@ public: static void Name(std::vector<std::string> & name){name.push_back(std::st
/*-------------------------- Curvature Direction ----------------------------------*/ /*-------------------------- Curvature Direction ----------------------------------*/
template <class S> template <class S>
struct CurvatureDirType{ struct CurvatureDirBaseType{
typedef Point3<S> VecType; typedef Point3<S> VecType;
typedef S ScalarType; typedef S ScalarType;
CurvatureDirType () {} CurvatureDirBaseType () {}
Point3<S>max_dir,min_dir; // max and min curvature direction Point3<S>max_dir,min_dir; // max and min curvature direction
S k1,k2;// max and min curvature values S k1,k2;// max and min curvature values
}; };
template <class TT> class EmptyCurvatureDir: public TT { template <class TT> class EmptyCurvatureDir: public TT {
public: public:
typedef CurvatureDirType<float> CurvatureDirType; typedef CurvatureDirBaseType<float> CurvatureDirType;
Point3f &PD1(){static Point3f dummy(0,0,0); return dummy;} Point3f &PD1(){static Point3f dummy(0,0,0); return dummy;}
Point3f &PD2(){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 T> class CurvatureDirf: public CurvatureDir<CurvatureDirType<float>, T> { template <class T> class CurvatureDirf: public CurvatureDir<CurvatureDirBaseType<float>, T> {
public: static void Name(std::vector<std::string> & name){name.push_back(std::string("CurvatureDirf"));T::Name(name);} public: static void Name(std::vector<std::string> & name){name.push_back(std::string("CurvatureDirf"));T::Name(name);}
}; };
template <class T> class CurvatureDird: public CurvatureDir<CurvatureDirType<double>, T> { template <class T> class CurvatureDird: public CurvatureDir<CurvatureDirBaseType<double>, T> {
public: static void Name(std::vector<std::string> & name){name.push_back(std::string("CurvatureDird"));T::Name(name);} public: static void Name(std::vector<std::string> & name){name.push_back(std::string("CurvatureDird"));T::Name(name);}
}; };