From e6760f090ab20f50e06c3299808829b9ff8a19ce Mon Sep 17 00:00:00 2001
From: Peter Hachenberger <hachenberger@mpi-inf.mpg.de>
Date: Fri, 24 Mar 2006 13:07:38 +0000
Subject: [PATCH] added CGAL_ to some macros

---
 Nef_3/include/CGAL/Nef_3/K3_tree.h            |  6 +-
 Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h  | 14 +--
 Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h |  6 +-
 Nef_3/include/CGAL/Nef_3/SNC_point_locator.h  | 86 +++++++++----------
 .../CGAL/Nef_3/polyhedron_3_to_nef_3.h        |  6 +-
 ...uotient_coordinates_to_homogeneous_point.h |  6 +-
 .../CGAL/Nef_3/vertex_cycle_to_nef_3.h        |  6 +-
 Nef_3/include/CGAL/OFF_to_nef_3.h             | 10 +--
 8 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/Nef_3/include/CGAL/Nef_3/K3_tree.h b/Nef_3/include/CGAL/Nef_3/K3_tree.h
index 6142e5f2dba..bfab313ce5f 100644
--- a/Nef_3/include/CGAL/Nef_3/K3_tree.h
+++ b/Nef_3/include/CGAL/Nef_3/K3_tree.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Miguel Granados <granados@mpi-sb.mpg.de>
 
-#ifndef K3_TREE_H
-#define K3_TREE_H
+#ifndef CGAL_NEF_K3_TREE_H
+#define CGAL_NEF_K3_TREE_H
 
 #include <CGAL/basic.h>
 #include <CGAL/Unique_hash_map.h>
@@ -1169,5 +1169,5 @@ bool is_point_on_cell( const Point_3& p, const Node* target, const Node* current
 
 CGAL_END_NAMESPACE
 
-#endif // K3_TREE_H
+#endif // CGAL_NEF_K3_TREE_H
 
diff --git a/Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h b/Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h
index f4d2f7d826f..8c0b716d298 100644
--- a/Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h
+++ b/Nef_3/include/CGAL/Nef_3/SNC_SM_visualizor.h
@@ -28,8 +28,8 @@
 #include <CGAL/Nef_S2/SM_decorator.h>
 #include <CGAL/Nef_S2/SM_triangulator.h>
 
-#define LGREY CGAL::Color(170,170,200)
-#define DGREY CGAL::Color(30,30,50)
+#define CGAL_NEF_LGREY CGAL::Color(170,170,200)
+#define CGAL_NEF_DGREY CGAL::Color(30,30,50)
 
 CGAL_BEGIN_NAMESPACE
 
@@ -49,7 +49,7 @@ public:
   Color color(SHalfloop_const_handle, Mark m) const
   { return ( m ? CGAL::BLACK : CGAL::WHITE ); }
   Color color(SFace_const_handle, Mark m) const
-  { return ( m ? DGREY : LGREY ); }
+  { return ( m ? CGAL_NEF_DGREY : CGAL_NEF_LGREY ); }
 };
 
 
@@ -160,7 +160,7 @@ void draw_map() const
       T_.incident_mark(hn) == T_.incident_mark(hnn));
     Mark m = T_.incident_mark(h);
     Sphere_triangle t = T_.incident_triangle(h);
-    S_.push_back(t, (m ? DGREY : LGREY) );
+    S_.push_back(t, (m ? CGAL_NEF_DGREY : CGAL_NEF_LGREY) );
     Done[h]=Done[hn]=Done[hnn]=true;
   }
 
@@ -197,7 +197,7 @@ void draw_triangulation() const
 			T_.incident_mark(en)==T_.incident_mark(enn));
     Mark m = T_.incident_mark(e);
     Sphere_triangle t = T_.incident_triangle(e);
-    S_.push_back(t, (m ? DGREY : LGREY) );
+    S_.push_back(t, (m ? CGAL_NEF_DGREY : CGAL_NEF_LGREY) );
     Done[e]=Done[en]=Done[enn]=true;
   }
 
@@ -217,7 +217,7 @@ void show_sphere_map_of(typename Map_::Vertex_handle v)
 
 
 CGAL_END_NAMESPACE
-//#undef LGREY
-//#undef DGREY
+//#undef CGAL_NEF_LGREY
+//#undef CGAL_NEF_DGREY
 #endif // CGAL_SNC_SM_VISUALIZOR_H
 
diff --git a/Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h b/Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h
index 7559abec262..54cafc77187 100644
--- a/Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h
+++ b/Nef_3/include/CGAL/Nef_3/SNC_k3_tree_traits.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Miguel Granados <granados@mpi-sb.mpg.de>
 
-#ifndef SNC_K3_TREE_TRAITS_H
-#define SNC_K3_TREE_TRAITS_H
+#ifndef CGAL_NEF_SNC_K3_TREE_TRAITS_H
+#define CGAL_NEF_SNC_K3_TREE_TRAITS_H
 
 #include <CGAL/Nef_3/Bounding_box_3.h>
 #include <list>
@@ -580,5 +580,5 @@ Objects_bbox<SNC_decorator>::operator()
 
 CGAL_END_NAMESPACE
 
-#endif // SNC_K3_TREE_TRAITS_H
+#endif // CGAL_NEF_SNC_K3_TREE_TRAITS_H
 
diff --git a/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h b/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h
index 2eb72b86a52..8032bc648fb 100644
--- a/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h
+++ b/Nef_3/include/CGAL/Nef_3/SNC_point_locator.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Miguel Granados <granados@mpi-sb.mpg.de>
 
-#ifndef SNC_POINT_LOCATOR_H
-#define SNC_POINT_LOCATOR_H
+#ifndef CGAL_NEF_SNC_POINT_LOCATOR_H
+#define CGAL_NEF_SNC_POINT_LOCATOR_H
 
 #include <CGAL/basic.h>
 #include <CGAL/Nef_3/SNC_intersection.h>
@@ -49,11 +49,11 @@
 // TODO: find out the proper CGAL replacement for this macro and remove it
 #define CGAL_for_each( i, C) for( i = C.begin(); i != C.end(); ++i)
 
-// #define TIMER(instruction) instruction
-#define TIMER(instruction)
+// #define CGAL_NEF_TIMER(instruction) instruction
+#define CGAL_NEF_TIMER(instruction)
 
-// #define CLOG(t) std::clog <<" "<<t<<std::endl; std::clog.flush()
-#define CLOG(t)
+// #define CGAL_NEF_CLOG(t) std::clog <<" "<<t<<std::endl; std::clog.flush()
+#define CGAL_NEF_CLOG(t)
 
 CGAL_BEGIN_NAMESPACE
 
@@ -131,16 +131,16 @@ public:
   virtual void add_vertex(Vertex_handle v) {}
 
   virtual ~SNC_point_locator() {
-    CLOG("");
-    CLOG("construction_time:  "<<ct_t.time());
-    CLOG("pointlocation_time: "<<pl_t.time());
-    CLOG("rayshooting_time:   "<<rs_t.time());
-    CLOG("intersection_time:  "<<it_t.time());
+    CGAL_NEF_CLOG("");
+    CGAL_NEF_CLOG("construction_time:  "<<ct_t.time());
+    CGAL_NEF_CLOG("pointlocation_time: "<<pl_t.time());
+    CGAL_NEF_CLOG("rayshooting_time:   "<<rs_t.time());
+    CGAL_NEF_CLOG("intersection_time:  "<<it_t.time());
     // warning: the total time showed here could be actually larger
     // that the real time used by this class, since point location
     // and intersection test use the ray shooter and so the same time 
     // could be account to more than one timer
-    CLOG("pltotal_time:       "<<
+    CGAL_NEF_CLOG("pltotal_time:       "<<
       ct_t.time()+pl_t.time()+rs_t.time()+it_t.time());
   };
 };
@@ -297,12 +297,12 @@ public:
     set_snc(*W);
     candidate_provider = new SNC_candidate_provider(W);
 #else // CGAL_NEF_LIST_OF_TRIANGLES
-    TIMER(ct_t.start());
+    CGAL_NEF_TIMER(ct_t.start());
     strcpy( this->version_, "Point Locator by Spatial Subdivision (tm)");
 #ifdef CGAL_NEF3_TRIANGULATE_FACETS
-    CLOG(version()<<" (with triangulated facets)");
+    CGAL_NEF_CLOG(version()<<" (with triangulated facets)");
 #else
-    CLOG(version());
+    CGAL_NEF_CLOG(version());
 #endif
     CGAL_assertion( W != NULL);
 //    (Base) *this = SNC_decorator(*W);
@@ -396,7 +396,7 @@ public:
       delete candidate_provider;
     candidate_provider = new SNC_candidate_provider(objects,oli);
     // CGAL_NEF_TRACEN(*candidate_provider);
-    TIMER(ct_t.stop());
+    CGAL_NEF_TIMER(ct_t.stop());
 #endif // CGAL_NEF_LIST_OF_TRIANGLES
     initialized = true;
   }
@@ -412,10 +412,10 @@ public:
   virtual bool update( Unique_hash_map<Vertex_handle, bool>& V, 
                        Unique_hash_map<Halfedge_handle, bool>& E, 
                        Unique_hash_map<Halffacet_handle, bool>& F) {
-    TIMER(ct_t.start());
+    CGAL_NEF_TIMER(ct_t.start());
     CGAL_assertion( initialized);
     bool updated = candidate_provider->update( V, E, F);
-    TIMER(ct_t.stop());
+    CGAL_NEF_TIMER(ct_t.stop());
     return updated;
   }
 
@@ -425,7 +425,7 @@ public:
   }
 
   virtual Object_handle shoot(const Ray_3& ray, int mask=255) const {
-    TIMER(rs_t.start());
+    CGAL_NEF_TIMER(rs_t.start());
     CGAL_assertion( initialized);
     _CGAL_NEF_TRACEN( "shooting: "<<ray);
     Object_handle result;
@@ -547,13 +547,13 @@ public:
       if(!hit)
         ++objects_iterator;
     }
-    TIMER(rs_t.stop());
+    CGAL_NEF_TIMER(rs_t.stop());
     return result;
   }
 
   virtual Object_handle locate( const Point_3& p) const {
     if(Infi_box::extended_kernel()) {
-    TIMER(pl_t.start());
+    CGAL_NEF_TIMER(pl_t.start());
     CGAL_assertion( initialized);
     _CGAL_NEF_TRACEN( "locate "<<p);
     Object_handle result;
@@ -622,8 +622,8 @@ public:
       _CGAL_NEF_TRACEN("shooting ray to determine the volume");
       Ray_3 r( p, Vector_3( -1, 0, 0));
       result = Object_handle(determine_volume(r));
-    }    TIMER(pl_t.start());
-    TIMER(pl_t.stop());
+    }    CGAL_NEF_TIMER(pl_t.start());
+    CGAL_NEF_TIMER(pl_t.stop());
     return result;
   } else {   // standard kernel
     CGAL_assertion( initialized);
@@ -790,7 +790,7 @@ public:
   virtual void intersect_with_edges_and_facets( Halfedge_handle e0,
 	const typename SNC_point_locator::Intersection_call_back& call_back) const {
 
-    TIMER(it_t.start());
+    CGAL_NEF_TIMER(it_t.start());
     CGAL_assertion( initialized);
     _CGAL_NEF_TRACEN( "intersecting edge: "<<&*e0<<' '<<Segment_3(e0->source()->point(),
                                                          e0->twin()->source()->point()));
@@ -867,12 +867,12 @@ public:
       else
         CGAL_assertion_msg( 0, "wrong handle");
     }
-    TIMER(it_t.stop());
+    CGAL_NEF_TIMER(it_t.stop());
   }
 
   virtual void intersect_with_edges( Halfedge_handle e0,
     const typename SNC_point_locator::Intersection_call_back& call_back) const {
-    TIMER(it_t.start());
+    CGAL_NEF_TIMER(it_t.start());
     CGAL_assertion( initialized);
     _CGAL_NEF_TRACEN( "intersecting edge: "<<&*e0<<' '<<Segment_3(e0->source()->point(),
                                                          e0->twin()->source()->point()));
@@ -923,12 +923,12 @@ public:
       else
         CGAL_assertion_msg( 0, "wrong handle");
     }
-    TIMER(it_t.stop());
+    CGAL_NEF_TIMER(it_t.stop());
   }
 
   virtual void intersect_with_facets( Halfedge_handle e0, 
     const typename SNC_point_locator::Intersection_call_back& call_back) const {
-    TIMER(it_t.start());
+    CGAL_NEF_TIMER(it_t.start());
     CGAL_assertion( initialized);
     _CGAL_NEF_TRACEN( "intersecting edge: "<< Segment_3(e0->source()->point(),
                                                e0->twin()->source()->point()));
@@ -991,7 +991,7 @@ public:
       else
         CGAL_assertion_msg( 0, "wrong handle");
     }
-    TIMER(it_t.stop());
+    CGAL_NEF_TIMER(it_t.stop());
   }
 
 private:
@@ -1083,13 +1083,13 @@ public:
 public:
   SNC_point_locator_naive() : initialized(false) {}
   virtual void initialize(SNC_structure* W) { 
-    TIMER(ct_t.start());
+    CGAL_NEF_TIMER(ct_t.start());
     strcpy(this->version_, "Naive Point Locator (tm)");
-    CLOG(version());
+    CGAL_NEF_CLOG(version());
     CGAL_assertion( W != NULL);
     Base::initialize(W); 
     initialized = true;
-    TIMER(ct_t.stop());
+    CGAL_NEF_TIMER(ct_t.stop());
   }
 
   virtual Self* clone() const { 
@@ -1099,25 +1099,25 @@ public:
   virtual bool update( Unique_hash_map<Vertex_handle, bool>& V, 
                        Unique_hash_map<Halfedge_handle, bool>& E, 
                        Unique_hash_map<Halffacet_handle, bool>& F) {
-    TIMER(ct_t.start());
+    CGAL_NEF_TIMER(ct_t.start());
     CGAL_assertion( initialized);
-    TIMER(ct_t.stop());
+    CGAL_NEF_TIMER(ct_t.stop());
     return false;
   }
 
   virtual ~SNC_point_locator_naive() {}
 
   virtual Object_handle locate(const Point_3& p) const {
-    TIMER(pl_t.start());
+    CGAL_NEF_TIMER(pl_t.start());
     CGAL_assertion( initialized);
-    TIMER(pl_t.stop());
+    CGAL_NEF_TIMER(pl_t.stop());
     return Base::locate(p);
   }
 
   virtual Object_handle shoot(const Ray_3& r, int mask=0) const {
-    TIMER(rs_t.start());
+    CGAL_NEF_TIMER(rs_t.start());
     CGAL_assertion( initialized);
-    TIMER(rs_t.stop());
+    CGAL_NEF_TIMER(rs_t.stop());
     return Base::shoot(r);
   }
 
@@ -1131,7 +1131,7 @@ public:
 
   virtual void intersect_with_edges( Halfedge_handle e0, 
     const typename SNC_point_locator::Intersection_call_back& call_back) const {
-    TIMER(it_t.start());
+    CGAL_NEF_TIMER(it_t.start());
     CGAL_assertion( initialized);
     CGAL_NEF_TRACEN( "intersecting edge: "<< Segment_3(e0->source()->point(),
                                               e0->twin()->source()->point()));
@@ -1153,12 +1153,12 @@ public:
         call_back( e0, Object_handle(e), q);
       }
     }
-    TIMER(it_t.stop());
+    CGAL_NEF_TIMER(it_t.stop());
   }
 
   virtual void intersect_with_facets( Halfedge_handle e0, 
     const typename SNC_point_locator::Intersection_call_back& call_back) const {
-    TIMER(it_t.start());
+    CGAL_NEF_TIMER(it_t.start());
     CGAL_assertion( initialized);
     CGAL_NEF_TRACEN( "intersecting edge: "<< Segment_3(e0->source()->point(),
                                               e0->twin()->source()->point()));
@@ -1179,7 +1179,7 @@ public:
         call_back( e0, Object_handle(f), q);
       }
     }
-    TIMER(it_t.stop());
+    CGAL_NEF_TIMER(it_t.stop());
   }
 
 private:
@@ -1188,5 +1188,5 @@ private:
 #endif
 
 CGAL_END_NAMESPACE
-#endif // SNC_POINT_LOCATOR_H
+#endif // CGAL_NEF_SNC_POINT_LOCATOR_H
 
diff --git a/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h
index 32657cfed69..1d5d7e91eb9 100644
--- a/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h
+++ b/Nef_3/include/CGAL/Nef_3/polyhedron_3_to_nef_3.h
@@ -19,8 +19,8 @@
 //                 Miguel Granados <granados@mpi-sb.mpg.de>
 //                 Susan Hert      <hert@mpi-sb.mpg.de>
 //                 Lutz Kettner    <kettner@mpi-sb.mpg.de>
-#ifndef POLYHEDRON_3_TO_NEF_3_H
-#define POLYHEDRON_3_TO_NEF_3_H
+#ifndef CGAL_NEF_POLYHEDRON_3_TO_NEF_3_H
+#define CGAL_NEF_POLYHEDRON_3_TO_NEF_3_H
 
 #include <CGAL/Circulator_project.h>
 #include <CGAL/normal_vector_newell_3.h>
@@ -219,5 +219,5 @@ void polyhedron_3_to_nef_3(Polyhedron_& P, SNC_structure& S)
 
 CGAL_END_NAMESPACE
 
-#endif //POLYHEDRON_3_TO_NEF_3_H
+#endif //CGAL_NEF_POLYHEDRON_3_TO_NEF_3_H
 
diff --git a/Nef_3/include/CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h b/Nef_3/include/CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h
index 95660780ca1..e151447242d 100644
--- a/Nef_3/include/CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h
+++ b/Nef_3/include/CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h
@@ -17,8 +17,8 @@
 //
 // Author(s)     : Miguel Granados <granados@mpi-sb.mpg.de>
 
-#ifndef QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H
-#define QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H
+#ifndef CGAL_NEF_QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H
+#define CGAL_NEF_QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H
 
 CGAL_BEGIN_NAMESPACE
 
@@ -48,4 +48,4 @@ quotient_coordinates_to_homogeneous_point(
 
 CGAL_END_NAMESPACE
 
-#endif // QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H
+#endif // CGAL_NEF_QUOTIENT_COORDINATES_TO_HOMOGENEOUS_POINT_H
diff --git a/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h b/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h
index 1b8581eecc4..ff4740a9b7e 100644
--- a/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h
+++ b/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h
@@ -13,8 +13,8 @@
 //
 // Author(s)     : Ralf Osbild <osbild@mpi-sb.mpg.de>
 
-#ifndef VERTEX_CYCLE_TO_NEF_3_H
-#define VERTEX_CYCLE_TO_NEF_3_H
+#ifndef CGAL_NEF_VERTEX_CYCLE_TO_NEF_3_H
+#define CGAL_NEF_VERTEX_CYCLE_TO_NEF_3_H
 
 #include <iostream>
 #include <sstream>
@@ -330,4 +330,4 @@ typedef CGAL::Constrained_triangulation_plus_2<YZ_tri>     YZ_tri_plus;
 }
 
 CGAL_END_NAMESPACE
-#endif // VERTEX_CYCLE_TO_NEF_3_H
+#endif // CGAL_NEF_VERTEX_CYCLE_TO_NEF_3_H
diff --git a/Nef_3/include/CGAL/OFF_to_nef_3.h b/Nef_3/include/CGAL/OFF_to_nef_3.h
index adfd46e9588..05b9f3b2fda 100644
--- a/Nef_3/include/CGAL/OFF_to_nef_3.h
+++ b/Nef_3/include/CGAL/OFF_to_nef_3.h
@@ -13,15 +13,15 @@
 //
 // Author(s)     : Ralf Osbild <osbild@mpi-sb.mpg.de>
 
-#ifndef OFF_TO_NEF_3_H
-#define OFF_TO_NEF_3_H
+#ifndef CGAL_OFF_TO_NEF_3_H
+#define CGAL_OFF_TO_NEF_3_H
 
 #include <CGAL/Nef_polyhedron_3.h>
 
 // --- begin preliminary number type converter -----------------
 
-#ifndef NUMBER_TYPE_CONVERTER_NEF_3_H
-#define NUMBER_TYPE_CONVERTER_NEF_3_H
+#ifndef CGAL_NUMBER_TYPE_CONVERTER_NEF_3_H
+#define CGAL_NUMBER_TYPE_CONVERTER_NEF_3_H
 
 #include<sstream>
 #include<CGAL/Gmpz.h>
@@ -241,4 +241,4 @@ OFF_to_nef_3 (std::istream &i_st, Nef_3 &nef_union, bool verb=false)
 }
 
 CGAL_END_NAMESPACE
-#endif // OFF_TO_NEF_3_H
+#endif // CGAL_OFF_TO_NEF_3_H