From 0b99eaa7b2625ee36226548dfa6b9c1dd45475d3 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Wed, 24 Mar 2021 14:53:00 +0100
Subject: [PATCH] first complex.h files made self-sufficient

---
 vcg/complex/allocate.h                | 11 ++++++++---
 vcg/complex/base.h                    | 11 ++++++++---
 vcg/complex/exception.h               |  3 +++
 vcg/container/simple_temporary_data.h |  5 +++--
 vcg/simplex/edge/pos.h                |  2 ++
 vcg/simplex/edge/topology.h           |  3 +++
 vcg/simplex/face/pos.h                |  2 ++
 vcg/simplex/face/topology.h           |  2 +-
 8 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/vcg/complex/allocate.h b/vcg/complex/allocate.h
index fa56dd27..461684a9 100644
--- a/vcg/complex/allocate.h
+++ b/vcg/complex/allocate.h
@@ -23,9 +23,14 @@
 #ifndef __VCGLIB_TRIALLOCATOR
 #define __VCGLIB_TRIALLOCATOR
 
-#ifndef __VCG_MESH
-#error "This file should not be included alone. It is automatically included by complex.h"
-#endif
+#include <vector>
+#include <set>
+
+#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 {
diff --git a/vcg/complex/base.h b/vcg/complex/base.h
index adb0316e..60cdb8cc 100644
--- a/vcg/complex/base.h
+++ b/vcg/complex/base.h
@@ -20,12 +20,17 @@
 * for more details.                                                         *
 *                                                                           *
 ****************************************************************************/
-#ifndef __VCG_MESH
-#error "This file should not be included alone. It is automatically included by complex.h"
-#endif
+//#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
 
+#include <typeindex>
+#include <vcg/container/simple_temporary_data.h>
+
+#include "used_types.h"
+
 namespace vcg {
 
 class PointerToAttribute
diff --git a/vcg/complex/exception.h b/vcg/complex/exception.h
index b42c4c37..36d5ef6d 100644
--- a/vcg/complex/exception.h
+++ b/vcg/complex/exception.h
@@ -23,6 +23,9 @@
 #ifndef __VCG_EXCEPTION_H
 #define __VCG_EXCEPTION_H
 
+#include <stdexcept>
+#include <iostream>
+
 namespace vcg
 {
 class MissingComponentException : public std::runtime_error
diff --git a/vcg/container/simple_temporary_data.h b/vcg/container/simple_temporary_data.h
index ac00c378..4e91c195 100644
--- a/vcg/container/simple_temporary_data.h
+++ b/vcg/container/simple_temporary_data.h
@@ -24,10 +24,11 @@
 #ifndef __VCGLIB_SIMPLE__
 #define __VCGLIB_SIMPLE__
 
-#include <string.h>
+#include <string>
+#include <cstring>
 #include <limits>
 #include <vector>
-#include <assert.h>
+#include <cassert>
 
 namespace vcg
 {
diff --git a/vcg/simplex/edge/pos.h b/vcg/simplex/edge/pos.h
index 2b278f53..cc455bc9 100644
--- a/vcg/simplex/edge/pos.h
+++ b/vcg/simplex/edge/pos.h
@@ -24,6 +24,8 @@
 #ifndef __VCG_EDGE_POS
 #define __VCG_EDGE_POS
 
+#include <cassert>
+
 namespace vcg {
 namespace edge {
 
diff --git a/vcg/simplex/edge/topology.h b/vcg/simplex/edge/topology.h
index 6156a96d..13904c05 100644
--- a/vcg/simplex/edge/topology.h
+++ b/vcg/simplex/edge/topology.h
@@ -24,6 +24,9 @@
 #ifndef _VCG_EDGE_TOPOLOGY
 #define _VCG_EDGE_TOPOLOGY
 
+#include <vector>
+#include <vcg/complex/allocate.h>
+
 namespace vcg {
 namespace edge {
 /** \addtogroup edge */
diff --git a/vcg/simplex/face/pos.h b/vcg/simplex/face/pos.h
index bfc0103f..a20d4ac3 100644
--- a/vcg/simplex/face/pos.h
+++ b/vcg/simplex/face/pos.h
@@ -29,6 +29,8 @@
 #ifndef __VCG_FACE_POS
 #define __VCG_FACE_POS
 
+#include <cassert>
+
 namespace vcg {
 namespace face {
 
diff --git a/vcg/simplex/face/topology.h b/vcg/simplex/face/topology.h
index bd14e018..bb07cec7 100644
--- a/vcg/simplex/face/topology.h
+++ b/vcg/simplex/face/topology.h
@@ -24,7 +24,7 @@
 #ifndef _VCG_FACE_TOPOLOGY
 #define _VCG_FACE_TOPOLOGY
 
-#include <vcg/simplex/face/pos.h>
+#include <vcg/complex/allocate.h>
 
 namespace vcg {
 namespace face {