From c21fa93cf2e6edbd2cdc312930236cc3c77bf13c Mon Sep 17 00:00:00 2001
From: Menelaos Karavelas <mkaravel@iacm.forth.gr>
Date: Thu, 8 May 2003 08:39:03 +0000
Subject: [PATCH] added short names support

---
 .../include/CGAL/Apollonius_graph_2.h         | 11 +++--
 .../CGAL/Apollonius_graph_face_base_2.h       |  4 ++
 .../CGAL/Apollonius_graph_hierarchy_2.h       |  5 ++-
 .../CGAL/Apollonius_graph_short_names_2.h     | 40 +++++++++++++++++++
 .../CGAL/Apollonius_graph_vertex_base_2.h     |  3 ++
 .../include/CGAL/Apollonius_site_2.h          |  2 +
 6 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_short_names_2.h

diff --git a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
index 94f9b83dbe4..690e38fc818 100644
--- a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
+++ b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_2.h
@@ -30,6 +30,8 @@
 #include <vector>
 #include <map>
 
+#include <CGAL/Apollonius_graph_short_names_2.h>
+
 #include <CGAL/Triangulation_2.h>
 #include <CGAL/Apollonius_graph_data_structure_2.h>
 #include <CGAL/Apollonius_graph_face_base_2.h>
@@ -168,10 +170,11 @@ public:
   typedef Site_2               value_type; // to have a back_inserter
   typedef const value_type&    const_reference; 
   typedef value_type&          reference;
-private:
-  typedef struct   Vertex_iterator {};
-  typedef struct   Face_iterator {};
-  typedef struct   Edge_iterator {};
+
+public:
+  struct   Vertex_iterator {};
+  struct   Face_iterator {};
+  struct   Edge_iterator {};
 
 protected:
   // some more local types
diff --git a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_face_base_2.h b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_face_base_2.h
index f04ec255365..55657d9daa8 100644
--- a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_face_base_2.h
+++ b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_face_base_2.h
@@ -27,6 +27,10 @@
 #ifndef CGAL_APOLLONIUS_GRAPH_FACE_BASE_2_H
 #define CGAL_APOLLONIUS_GRAPH_FACE_BASE_2_H
 
+
+#include <CGAL/Apollonius_graph_short_names_2.h>
+
+
 #include <CGAL/Triangulation_ds_face_base_2.h>
 #include <CGAL/triangulation_assertions.h>
 
diff --git a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h
index 3b3982bd5e0..387be8a824d 100644
--- a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h
+++ b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_hierarchy_2.h
@@ -27,9 +27,12 @@
 #ifndef CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_H
 #define CGAL_APOLLONIUS_GRAPH_HIERARCHY_2_H
 
-#include <CGAL/Random.h>
 #include <map>
 
+#include <CGAL/Apollonius_graph_short_names_2.h>
+
+#include <CGAL/Random.h>
+
 #include <CGAL/Apollonius_graph_2.h>
 #include <CGAL/Apollonius_graph_data_structure_2.h>
 #include <CGAL/Apollonius_graph_vertex_base_2.h>
diff --git a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_short_names_2.h b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_short_names_2.h
new file mode 100644
index 00000000000..10bc27c5616
--- /dev/null
+++ b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_short_names_2.h
@@ -0,0 +1,40 @@
+// ======================================================================
+//
+// Copyright (c) 2003 The CGAL Consortium
+//
+// This software and related documentation is part of an INTERNAL release
+// of the Computational Geometry Algorithms Library (CGAL). It is not
+// intended for general use.
+//
+// ----------------------------------------------------------------------
+//
+// release       : 
+// release_date  : 
+//
+// file          : include/CGAL/Apollonius_graph_short_names_2.h
+// package       : Apollonius_graph_2
+// source        : $RCSfile$
+// revision      : $Revision$
+// revision_date : $Date$
+// author(s)     : Menelaos Karavelas <mkaravel@cse.nd.edu>
+//
+// coordinator   :
+//
+// ======================================================================
+
+
+
+#ifndef CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H
+#define CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H
+
+
+#define Apollonius_graph_2                  Ag2
+#define Apollonius_graph_hiearchy_2         Agh2
+#define Apollonius_graph_data_structure_2   Agds2
+#define Apollonius_graph_vertex_base_2      Agvb2
+#define Apollonius_graph_face_base_2        Agfb2
+#define Apollonius_graph_euclidean_traits_2 Aget2
+
+
+
+#endif //CGAL_APOLLONIUS_GRAPH_SHORT_NAMES_2_H
diff --git a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h
index 10fd27e3ec6..6c29c480a8c 100644
--- a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h
+++ b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_graph_vertex_base_2.h
@@ -28,6 +28,9 @@
 #define CGAL_APOLLONIUS_GRAPH_VERTEX_BASE_2_H
 
 #include <list>
+
+#include <CGAL/Apollonius_graph_short_names_2.h>
+
 #include <CGAL/Triangulation_vertex_base_2.h>
 #include <CGAL/triangulation_assertions.h>
 
diff --git a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_site_2.h b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_site_2.h
index a4dc318d993..985647af0ae 100644
--- a/Packages/Apollonius_graph_2/include/CGAL/Apollonius_site_2.h
+++ b/Packages/Apollonius_graph_2/include/CGAL/Apollonius_site_2.h
@@ -28,6 +28,8 @@
 #include <iostream>
 #include <CGAL/basic.h>
 
+#include <CGAL/Apollonius_graph_short_names_2.h>
+
 CGAL_BEGIN_NAMESPACE