diff --git a/vcg/simplex/vertexplus/base.h b/vcg/simplex/vertexplus/base.h index 33f4d0cf..a7a7c6ad 100644 --- a/vcg/simplex/vertexplus/base.h +++ b/vcg/simplex/vertexplus/base.h @@ -68,17 +68,14 @@ First working version! #ifndef __VCG_VERTEX_PLUS #define __VCG_VERTEX_PLUS -#include +//#include #include #include #include +#include namespace vcg { - class DumET {}; - class DumFT {}; - class DumTT {}; - /*------------------------------------------------------------------*/ /* The base class of all the recusive definition chain. It is just a container of the typenames of the various simplexes. @@ -125,68 +122,6 @@ class VertexBase: public vert::EmptyTexCoord< VertexTypeHolder > > > > > > >{ }; -// Metaprogramming Core - -template class A> - class VertexArity1: public A > { - }; - -template class A, template class B> - class VertexArity2: public B > {}; - -template class A, template class B, - template class C > - class VertexArity3: public C > {}; - -template class A, template class B, - template class C, template class D> - class VertexArity4: public D > {}; - -template class A, template class B, - template class C, template class D, - template class E > - class VertexArity5: public E > {}; - -template class A, template class B, - template class C, template class D, - template class E, template class F > - class VertexArity6: public F > {}; - -template class A, template class B, - template class C, template class D, - template class E, template class F, - template class G> - class VertexArity7: public G > {}; - -template class A, template class B, - template class C, template class D, - template class E, template class F, - template class G, template class H> - class VertexArity8: public H > {}; - -template class A, template class B, - template class C, template class D, - template class E, template class F, - template class G, template class H, - template class I> - class VertexArity9: public I > {}; - -template class A, template class B, - template class C, template class D, - template class E, template class F, - template class G, template class H, - template class I, template class J> - class VertexArity10: public J > {}; /* The Real Big Vertex class; @@ -207,7 +142,7 @@ template class G, template class H, template class I, template class J, template class K> -class VertexArityMax: public K > { +class VertexArityMax: public K > { // ----- Flags stuff ----- public: @@ -295,9 +230,6 @@ static inline bool DeleteBitFlag(int bitval) }; - -template < typename T=int> -class DefaultDeriver : public T {}; /* @@ -344,7 +276,7 @@ template class G = DefaultDeriver, template class H = DefaultDeriver, template class I = DefaultDeriver, template class J = DefaultDeriver, template class K = DefaultDeriver> - class VertexSimp2: public VertexArityMax {}; + class VertexSimp2: public VertexArityMax {}; template class A = DefaultDeriver, template class B = DefaultDeriver, @@ -353,7 +285,7 @@ template class G = DefaultDeriver, template class H = DefaultDeriver, template class I = DefaultDeriver, template class J = DefaultDeriver, template class K = DefaultDeriver> - class VertexSimp1: public VertexArityMax {}; + class VertexSimp1: public VertexArityMax {}; }// end namespace #endif