From d69e3e67cc14970906a33efdd92894e24abb140e Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 24 Mar 2021 17:59:53 +0100 Subject: [PATCH] cleanups --- vcg/complex/allocate.h | 4 ---- vcg/complex/base.h | 4 +--- vcg/complex/foreach.h | 4 ---- vcg/simplex/edge/base.h | 4 +--- vcg/simplex/edge/component.h | 4 +--- vcg/simplex/face/base.h | 4 +--- vcg/simplex/face/component.h | 4 +--- vcg/simplex/face/component_occ.h | 3 --- vcg/simplex/face/component_ocf.h | 3 --- vcg/simplex/tetrahedron/base.h | 4 +--- vcg/simplex/vertex/base.h | 4 +--- vcg/simplex/vertex/component.h | 4 +--- vcg/simplex/vertex/component_occ.h | 9 ++++++--- vcg/simplex/vertex/component_ocf.h | 4 +--- 14 files changed, 15 insertions(+), 44 deletions(-) diff --git a/vcg/complex/allocate.h b/vcg/complex/allocate.h index 60c370dc..b4b337d6 100644 --- a/vcg/complex/allocate.h +++ b/vcg/complex/allocate.h @@ -30,10 +30,6 @@ #include "used_types.h" -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif - namespace vcg { namespace tri { /** \addtogroup trimesh diff --git a/vcg/complex/base.h b/vcg/complex/base.h index 60cdb8cc..4a1e01f9 100644 --- a/vcg/complex/base.h +++ b/vcg/complex/base.h @@ -20,9 +20,7 @@ * for more details. * * * ****************************************************************************/ -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif + #ifndef __VCG_COMPLEX_BASE #define __VCG_COMPLEX_BASE diff --git a/vcg/complex/foreach.h b/vcg/complex/foreach.h index 58dc3d99..c2fa2cef 100644 --- a/vcg/complex/foreach.h +++ b/vcg/complex/foreach.h @@ -24,10 +24,6 @@ #ifndef VCG__FOREACH_H #define VCG__FOREACH_H -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif - #include namespace vcg { diff --git a/vcg/simplex/edge/base.h b/vcg/simplex/edge/base.h index 42309db1..8f9a71b7 100644 --- a/vcg/simplex/edge/base.h +++ b/vcg/simplex/edge/base.h @@ -20,9 +20,7 @@ * for more details. * * * ****************************************************************************/ -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif + #ifndef __VCG_EDGE_PLUS #define __VCG_EDGE_PLUS diff --git a/vcg/simplex/edge/component.h b/vcg/simplex/edge/component.h index 9c44c073..4e922ae3 100644 --- a/vcg/simplex/edge/component.h +++ b/vcg/simplex/edge/component.h @@ -20,9 +20,7 @@ * for more details. * * * ****************************************************************************/ -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif + #ifndef __VCG_EDGE_PLUS_COMPONENT #define __VCG_EDGE_PLUS_COMPONENT diff --git a/vcg/simplex/face/base.h b/vcg/simplex/face/base.h index 8f208cbd..967c7dbc 100644 --- a/vcg/simplex/face/base.h +++ b/vcg/simplex/face/base.h @@ -20,9 +20,7 @@ * for more details. * * * ****************************************************************************/ -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif + #ifndef __VCG_FACE_PLUS #define __VCG_FACE_PLUS diff --git a/vcg/simplex/face/component.h b/vcg/simplex/face/component.h index 5337d687..5ac8b3d6 100644 --- a/vcg/simplex/face/component.h +++ b/vcg/simplex/face/component.h @@ -20,9 +20,7 @@ * for more details. * * * ****************************************************************************/ -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif + #ifndef __VCG_FACE_PLUS_COMPONENT #define __VCG_FACE_PLUS_COMPONENT diff --git a/vcg/simplex/face/component_occ.h b/vcg/simplex/face/component_occ.h index 318e5852..a9eb739a 100644 --- a/vcg/simplex/face/component_occ.h +++ b/vcg/simplex/face/component_occ.h @@ -26,9 +26,6 @@ OCC = Optional Component Compact compare with OCF(Optional Component Fast) */ -#ifndef __VCG_MESH -#error "This file should not be included alone. It is automatically included by complex.h" -#endif #ifndef __VCG_FACE_PLUS_COMPONENT_OCC #define __VCG_FACE_PLUS_COMPONENT_OCC diff --git a/vcg/simplex/face/component_ocf.h b/vcg/simplex/face/component_ocf.h index 919b1a55..c0e0c0db 100644 --- a/vcg/simplex/face/component_ocf.h +++ b/vcg/simplex/face/component_ocf.h @@ -22,9 +22,6 @@ ****************************************************************************/ #ifndef __VCG_FACE_PLUS_COMPONENT_OCF #define __VCG_FACE_PLUS_COMPONENT_OCF -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif #include #include diff --git a/vcg/simplex/tetrahedron/base.h b/vcg/simplex/tetrahedron/base.h index d541503c..364cd857 100644 --- a/vcg/simplex/tetrahedron/base.h +++ b/vcg/simplex/tetrahedron/base.h @@ -30,9 +30,7 @@ added ****************************************************************************/ -// #ifndef __VCG_TETRA_MESH -// #error "This file should not be included alone. It is automatically included by complex.h" -// #endif + #ifndef __VCG_TETRA_PLUS #define __VCG_TETRA_PLUS diff --git a/vcg/simplex/vertex/base.h b/vcg/simplex/vertex/base.h index 649546f1..b12b0648 100644 --- a/vcg/simplex/vertex/base.h +++ b/vcg/simplex/vertex/base.h @@ -20,9 +20,7 @@ * for more details. * * * ****************************************************************************/ -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif + #ifndef __VCG_VERTEX_PLUS #define __VCG_VERTEX_PLUS diff --git a/vcg/simplex/vertex/component.h b/vcg/simplex/vertex/component.h index 4a1396d8..dab25640 100644 --- a/vcg/simplex/vertex/component.h +++ b/vcg/simplex/vertex/component.h @@ -20,9 +20,7 @@ * for more details. * * * ****************************************************************************/ -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif + #ifndef __VCG_VERTEX_PLUS_COMPONENT #define __VCG_VERTEX_PLUS_COMPONENT diff --git a/vcg/simplex/vertex/component_occ.h b/vcg/simplex/vertex/component_occ.h index 80e0e124..e15f5e68 100644 --- a/vcg/simplex/vertex/component_occ.h +++ b/vcg/simplex/vertex/component_occ.h @@ -33,12 +33,15 @@ Working release (compilata solo su MSVC), component_occ � migrato da component ****************************************************************************/ -#ifndef __VCG_MESH -#error "This file should not be included alone. It is automatically included by complex.h" -#endif + #ifndef __VCG_VERTEX_PLUS_COMPONENT_OCC #define __VCG_VERTEX_PLUS_COMPONENT_OCC +#include + +#include +#include + namespace vcg { namespace vertex { /* diff --git a/vcg/simplex/vertex/component_ocf.h b/vcg/simplex/vertex/component_ocf.h index 919a3090..c063308c 100644 --- a/vcg/simplex/vertex/component_ocf.h +++ b/vcg/simplex/vertex/component_ocf.h @@ -25,9 +25,7 @@ OCF = Optional Component Fast (hopefully) compare with OCC(Optional Component Compact) */ -//#ifndef __VCG_MESH -//#error "This file should not be included alone. It is automatically included by complex.h" -//#endif + #ifndef __VCG_VERTEX_PLUS_COMPONENT_OCF #define __VCG_VERTEX_PLUS_COMPONENT_OCF