From 04cdb64c0ff2a440c94186c6d9605d263a02e127 Mon Sep 17 00:00:00 2001
From: Dario Sassi <dario.s@egaltech.com>
Date: Thu, 3 Apr 2014 14:46:19 +0000
Subject: [PATCH] Include : - modifiche agli include delle collezioni.

---
 EGkGeoCollection.h                        |  4 +---
 ENkNumCollection.h => ENkCplxCollection.h | 11 +++------
 ENkPolynomial.h                           |  2 +-
 ENkPolynomialRoots.h                      |  2 +-
 EgtNumCollection.h                        | 27 +++++++++++++++++++++++
 5 files changed, 33 insertions(+), 13 deletions(-)
 rename ENkNumCollection.h => ENkCplxCollection.h (59%)
 create mode 100644 EgtNumCollection.h

diff --git a/EGkGeoCollection.h b/EGkGeoCollection.h
index e37e666..c2b21c8 100644
--- a/EGkGeoCollection.h
+++ b/EGkGeoCollection.h
@@ -15,9 +15,7 @@
 
 #include "/EgtDev/Include/EGkPoint3d.h"
 #include "/EgtDev/Include/EGkCurvePointDiffGeom.h"
-#include "/EgtDev/Include/ENkNumCollection.h"
-#include <vector>
-#include <list>
+#include "/EgtDev/Include/EgtNumCollection.h"
 
 //----------------------------------------------------------------------------
 // Raccolte di Point3d
diff --git a/ENkNumCollection.h b/ENkCplxCollection.h
similarity index 59%
rename from ENkNumCollection.h
rename to ENkCplxCollection.h
index 6e498b9..f27d325 100644
--- a/ENkNumCollection.h
+++ b/ENkCplxCollection.h
@@ -1,8 +1,8 @@
 //----------------------------------------------------------------------------
 //  EgalTech 2013-2014
 //----------------------------------------------------------------------------
-// File : ENkNumCollection.h       Data : 17.12.13          Versione : 1.4l1
-// Contenuto : Raccolte di oggetti numerici.       
+// File : ENkCplxCollection.h      Data : 02.04.14          Versione : 1.5d1
+// Contenuto : Raccolte di oggetti numerici complessi.       
 //
 //
 //
@@ -13,14 +13,9 @@
 
 #pragma once
 
+#include "/EgtDev/Include/EgtNumCollection.h"
 #include "/EgtDev/Include/ENkComplex.h"
-#include <vector>
-#include <list>
 
-//----------------------------------------------------------------------------
-// Raccolte di double
-typedef std::vector<double>   DBLVECTOR ;   // vettore di double
-typedef std::list<double>     DBLLIST ;     // lista di double
 
 //----------------------------------------------------------------------------
 // Raccolte di Complex
diff --git a/ENkPolynomial.h b/ENkPolynomial.h
index 2122b33..c4aec6c 100644
--- a/ENkPolynomial.h
+++ b/ENkPolynomial.h
@@ -22,7 +22,7 @@
 #endif
 
 //---------------------------Include------------------------------------------
-#include "/EgtDev/Include/ENkNumCollection.h"
+#include "/EgtDev/Include/ENkCplxCollection.h"
 
 
 //----------------------------------------------------------------------------
diff --git a/ENkPolynomialRoots.h b/ENkPolynomialRoots.h
index 5add1dc..be4acff 100644
--- a/ENkPolynomialRoots.h
+++ b/ENkPolynomialRoots.h
@@ -22,7 +22,7 @@
 #endif
 
 //---------------------------Include------------------------------------------
-#include "\EgtDev\Include\ENkNumCollection.h"
+#include "\EgtDev\Include\ENkCplxCollection.h"
 
 
 //----------------------------------------------------------------------------
diff --git a/EgtNumCollection.h b/EgtNumCollection.h
new file mode 100644
index 0000000..e770442
--- /dev/null
+++ b/EgtNumCollection.h
@@ -0,0 +1,27 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2014-2014
+//----------------------------------------------------------------------------
+// File : EgtNumCollection.h       Data : 02.04.14         Versione : 1.5d1
+// Contenuto : Raccolte di oggetti numerici semplici.       
+//
+//
+//
+// Modifiche : 02.04.14 DS Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+#include <vector>
+#include <list>
+
+//----------------------------------------------------------------------------
+// Raccolte di interi
+typedef std::vector<int>    INTVECTOR ;   // vettore di interi
+typedef std::list<int>      INT_LIST ;    // lista di interi (con _ per non collidere con Win)
+
+//----------------------------------------------------------------------------
+// Raccolte di double
+typedef std::vector<double> DBLVECTOR ;   // vettore di double
+typedef std::list<double>   DBLLIST ;     // lista di double