songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove short name macros. See PR 1551.

This commit is contained in:
Sylvain Pion 2009-04-21 18:28:04 +00:00
parent 2b180d08df
commit c1ae415b18
27 changed files with 0 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
View File

@ -20,9 +20,7 @@
#ifndef CGAL_CONSTRAINED_DELAUNAY_TRIANGULATION_2_H
#define CGAL_CONSTRAINED_DELAUNAY_TRIANGULATION_2_H
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Constrained_triangulation_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Constrained_triangulation_2.h
View File

@ -24,7 +24,6 @@
#include <set>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_2.h>
#include <CGAL/Constrained_triangulation_face_base_2.h>
#include <CGAL/iterator.h>

1
Triangulation_2/include/CGAL/Constrained_triangulation_face_base_2.h
View File

@ -21,7 +21,6 @@
#define CGAL_CONSTRAINED_TRIANGULATION_FACE_BASE_2_H
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_ds_face_base_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
View File

@ -21,7 +21,6 @@
#define CGAL_CONSTRAINED_TRIANGULATION_PLUS_2_H
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Constraint_hierarchy_2.h>
#include <CGAL/Constrained_Delaunay_triangulation_2.h>

1
Triangulation_2/include/CGAL/Dummy_tds_2.h
View File

@ -21,7 +21,6 @@
#define CGAL_TRIANGULATION_DUMMY_TDS_2_H
#include <CGAL/basic.h>
#include <CGAL/Triangulation_short_names_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h
View File

@ -23,7 +23,6 @@
#include <CGAL/Weighted_point.h>
#include <CGAL/number_utils_classes.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Kernel_traits.h>

1
Triangulation_2/include/CGAL/Regular_triangulation_face_base_2.h
View File

@ -22,7 +22,6 @@
#include <list>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_face_base_2.h>
CGAL_BEGIN_NAMESPACE

3
Triangulation_2/include/CGAL/Triangulation_2.h
View File

@ -17,8 +17,6 @@
//
// Author(s) : Olivier Devillers, Mariette Yvinec
#ifndef CGAL_TRIANGULATION_2_H
#define CGAL_TRIANGULATION_2_H
@ -33,7 +31,6 @@
#include <CGAL/Iterator_project.h>
#include <CGAL/function_objects.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_utils_2.h>

1
Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
View File

@ -31,7 +31,6 @@
#include <boost/tuple/tuple.hpp>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_utils_2.h>
#include <CGAL/Compact_container.h>

1
Triangulation_2/include/CGAL/Triangulation_ds_circulators_2.h
View File

@ -25,7 +25,6 @@
#include <iterator>
#include <CGAL/circulator.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_utils_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Triangulation_ds_face_2.h
View File

@ -21,7 +21,6 @@
#define CGAL_TRIANGULATION_DS_FACE_2_H
#include <CGAL/basic.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_utils_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Triangulation_ds_face_base_2.h
View File

@ -22,7 +22,6 @@
#include <CGAL/basic.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_utils_2.h>
#include <CGAL/Dummy_tds_2.h>

1
Triangulation_2/include/CGAL/Triangulation_ds_iterators_2.h
View File

@ -22,7 +22,6 @@
#include <iterator>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
//#include <CGAL/Triangulation_iterator_adaptator.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h
View File

@ -21,7 +21,6 @@
#define CGAL_TRIANGULATION_DS_VERTEX_2_H
#include <CGAL/basic.h>
#include <CGAL/Triangulation_short_names_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Triangulation_ds_vertex_base_2.h
View File

@ -22,7 +22,6 @@
#define CGAL_TRIANGULATION_DS_VERTEX_BASE_2_H
#include <CGAL/basic.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Dummy_tds_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Triangulation_euclidean_traits_2.h
View File

@ -30,7 +30,6 @@
#include <CGAL/distance_predicates_2.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Segment_2_Segment_2_intersection.h>
CGAL_BEGIN_NAMESPACE

4
Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xy_3.h
View File

@ -17,13 +17,9 @@
//
// Author(s) : Mariette Yvinec
#ifndef CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_XY_3_H
#define CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_XY_3_H
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Point_3.h>

2
Triangulation_2/include/CGAL/Triangulation_euclidean_traits_xz_3.h
View File

@ -17,11 +17,9 @@
//
// Author(s) : Mariette Yvinec
#ifndef CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_XZ_3_H
#define CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_XZ_3_H
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Point_3.h>

1
Triangulation_2/include/CGAL/Triangulation_euclidean_traits_yz_3.h
View File

@ -20,7 +20,6 @@
#ifndef CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_YZ_3_H
#define CGAL_TRIANGULATION_EUCLIDEAN_TRAITS_YZ_3_H
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Point_3.h>

1
Triangulation_2/include/CGAL/Triangulation_face_base_2.h
View File

@ -22,7 +22,6 @@
#include <CGAL/basic.h>
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_ds_face_base_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h
View File

@ -22,7 +22,6 @@
#define CGAL_TRIANGULATION_HIERARCHY_2_H
#include <CGAL/basic.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Random.h>
#include <CGAL/Triangulation_hierarchy_vertex_base_2.h>
#include <map>

1
Triangulation_2/include/CGAL/Triangulation_hierarchy_vertex_base_2.h
View File

@ -22,7 +22,6 @@
#define CGAL_TRIANGULATION_HIERARCHY_VERTEX_BASE_2_H
#include <CGAL/basic.h>
#include <CGAL/Triangulation_short_names_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/include/CGAL/Triangulation_iterator_adaptator.h
View File

@ -22,7 +22,6 @@
#define CGAL_TRIANGULATION_ITERATOR_ADAPTATOR_H
#include <CGAL/triangulation_assertions.h>
#include <CGAL/Triangulation_short_names_2.h>
CGAL_BEGIN_NAMESPACE

63
Triangulation_2/include/CGAL/Triangulation_short_names_2.h
View File

@ -1,63 +0,0 @@
// Copyright (c) 1997 INRIA Sophia-Antipolis (France).
// All rights reserved.
//
// This file is part of CGAL (www.cgal.org); you may redistribute it under
// the terms of the Q Public License version 1.0.
// See the file LICENSE.QPL distributed with CGAL.
//
// Licensees holding a valid commercial license may use this file in
// accordance with the commercial license agreement provided with the software.
//
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
//
// $URL$
// $Id$
//
//
// Author(s) : Mariette Yvinec
#ifndef CGAL_TRIANGULATION_SHORT_NAMES_2_H
#define CGAL_TRIANGULATION_SHORT_NAMES_2_H
#if 0 // Disabled to see if it's still really needed.
//Define shorter names to please some linkers
#define Triangulation_data_structure_2 Tds2
#define Triangulation_vertex_base_2 Tvb
#define Triangulation_face_base_2 Tfb
#define Triangulation_euclidean_traits_2 Et2
#define Triangulation_euclidean_traits_xy_3 Etxy3
#define Triangulation_euclidean_traits_xz_3 Etxz3
#define Triangulation_euclidean_traits_yz_3 Etyz3
#define Triangulation_ds_vertex_2 Tdsv
#define Triangulation_ds_face_2 Tdsf
#define Triangulation_ds_face_base_2 Tdsfb
#define Triangulation_ds_vertex_base_2 Tdsvb
#define Triangulation_vertex_2 Tv
#define Triangulation_face_2 Tf
#define Triangulation_vertex_handle_2 Tvh
#define Triangulation_face_handle_2 Tfh
#define Triangulation_vertex_iterator_2 Tvi
#define Triangulation_face_iterator_2 Tfi
#define Triangulation_edge_iterator_2 Tei
#define Triangulation_all_faces_iterator_2 Tafi
#define Triangulation_all_edges_iterator_2 Taei
#define Triangulation_all_vertices_iterator_2 Tavi
#define Triangulation_finite_faces_iterator_2 Tffi
#define Triangulation_finite_edges_iterator_2 Tfei
#define Triangulation_finite_vertices_iterator_2 Tfvi
#define Triangulation_vertex_circulator_2 Tvc
#define Triangulation_face_circulator_2 Tfc
#define Triangulation_edge_circulator_2 Tec
#define Constrained_triangulation_face_base_2 Ctfb
#define Regular_triangulation_euclidean_traits_2 Rtet2
#define Regular_triangulation_face_base_2 Rtfb
#define Regular_triangulation_vertex_base_2 Rtvb
#endif // 0
#endif //CGAL_TRIANGULATION_SHORT_NAMES_2_H

2
Triangulation_2/include/CGAL/Triangulation_vertex_base_2.h
View File

@ -17,12 +17,10 @@
//
// Author(s) : Mariette Yvinec
#ifndef CGAL_TRIANGULATION_VERTEX_BASE_2_H
#define CGAL_TRIANGULATION_VERTEX_BASE_2_H
#include <CGAL/basic.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_ds_vertex_base_2.h>
CGAL_BEGIN_NAMESPACE

1
Triangulation_2/test/Triangulation_2/test_delaunay_hierarchy_2.cpp
View File

@ -31,7 +31,6 @@
#include <CGAL/Line_2.h>
#include <CGAL/Ray_2.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_data_structure_2.h>
#include <CGAL/Delaunay_triangulation_2.h>
#include <CGAL/Triangulation_hierarchy_2.h>

1
Triangulation_2/test/Triangulation_2/test_delaunay_triangulation_2.cpp
View File

@ -24,7 +24,6 @@
#include <CGAL/_test_types.h>
#include <CGAL/Cartesian.h>
#include <CGAL/Triangulation_short_names_2.h>
#include <CGAL/Triangulation_euclidean_traits_2.h>
#include <CGAL/Triangulation_data_structure_2.h>
#include <CGAL/Delaunay_triangulation_2.h>