diff --git a/Packages/Triangulation_2/changes.txt b/Packages/Triangulation_2/changes.txt
index c13aec108f8..f691cb5e0c0 100644
--- a/Packages/Triangulation_2/changes.txt
+++ b/Packages/Triangulation_2/changes.txt
@@ -1,6 +1,9 @@
 Package triangulation: provides triangulations Delaunay triangulations, 
 constrained and regular triangulations with  tests and examples.
 
+ver 7.105 (01/08/03)
+- fixed missing std:: in new test of get_conflict() functions
+
 ver 7.104  (29/07/03)
 - change the return types of get_conflicts member functions in
   Delaunay and constrained_Delaunay triangulations
diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
index 9dc73b0eaa1..a4201e38c8f 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_2.h
@@ -100,7 +100,7 @@ public:
     Vertex_handle() : _v() {}
     Vertex_handle(const Vertex_iterator& v) : _v(v) {}
     Vertex_handle(const Vertex_circulator& v) : _v(v.base()._v) {}
-    Vertex_handle(void * n) : _v() 
+    Vertex_handle(void * CGAL_triangulation_precondition_code(n)) : _v()
     { CGAL_triangulation_precondition(n == NULL); }
 
     Vertex* operator->() const { return &*_v; }
@@ -134,7 +134,7 @@ public:
     Face_handle(const Face_iterator& f) : _f(f) {}
     Face_handle(const Face_circulator& f) : _f(f.base()._f) {}
     //Face_handle(Face_circulator f) : _f(f.base()._f) {}
-    Face_handle(void * n) : _f()
+    Face_handle(void * CGAL_triangulation_precondition_code(n)) : _f()
     { CGAL_triangulation_precondition(n == NULL); }
 
     Face* operator->() const { return &*_f; }
diff --git a/Packages/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_regular_hierarchy_2.C b/Packages/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_regular_hierarchy_2.C
index 1238e010b7e..cbef8098814 100644
--- a/Packages/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_regular_hierarchy_2.C
+++ b/Packages/Triangulation_2/test/Triangulation_2/include/CGAL/_test_cls_regular_hierarchy_2.C
@@ -13,7 +13,8 @@ _test_cls_regular_hierarchy_2( const Rh & )
  
   _test_cls_regular_triangulation_2( Regular_hierarchy());
   
-  int nn = 500;
+  //int nn = 500;
+  int nn=100;
   std::cout << " insertion of " << nn << "  points" << std::endl;
   Regular_hierarchy rh;
 
@@ -59,10 +60,9 @@ _test_cls_regular_hierarchy_2( const Rh & )
   std::cout << "  location" << std::endl;
   rh.locate(Bare_point(0.,0.));
   std::cout <<  "  removal of all points" << std::endl;
-  while( rh.number_of_vertices() >0) {
+  while( rh.number_of_vertices() > 0) {
     rh.remove(rh.finite_vertices_begin());
   }
-
   return;
 }
 
diff --git a/Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile b/Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile
index e25d99ca721..aa9cf8acbd4 100644
--- a/Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile
+++ b/Packages/Triangulation_2/test/Triangulation_2_Delaunay/Makefile
@@ -6,8 +6,10 @@
 
 
 #CGAL_MAKEFILE = /0/prisme_util/CGAL/CGAL-I/make/makefile_i686_Linux-2.2.18_g++-2.95_LEDA
+#CGAL_MAKEFILE=/u/papillon/0/prisme_util/CGAL/CGAL-I/make/makefile_sparc_SunOS-5.6_g++-2.95
 include $(CGAL_MAKEFILE)
 
+#CGAL_CXX=purify /usr/local/bin/g++ -static
 
 #---------------------------------------------------------------------#
 #                    compiler flags
@@ -54,7 +56,6 @@ test_regular_hierarchy_2: test_regular_hierarchy_2.o
 	$(CGAL_CXX) -o test_regular_hierarchy_2 test_regular_hierarchy_2.o $(LDFLAGS)
 
 
-
 clean:
 	- rm -f *.o  *.obj *.exe \
 	test_delaunay_triangulation_2 \
diff --git a/Packages/Triangulation_2/test/Triangulation_2_Delaunay/test_regular_hierarchy_2.C b/Packages/Triangulation_2/test/Triangulation_2_Delaunay/test_regular_hierarchy_2.C
index 19a2e98110f..78276d9e809 100644
--- a/Packages/Triangulation_2/test/Triangulation_2_Delaunay/test_regular_hierarchy_2.C
+++ b/Packages/Triangulation_2/test/Triangulation_2_Delaunay/test_regular_hierarchy_2.C
@@ -34,7 +34,7 @@
 #include <CGAL/_test_cls_regular_triangulation_2.C>
 #include <CGAL/_test_cls_regular_hierarchy_2.C>
 
-typedef CGAL::Regular_triangulation_euclidean_traits_2<Test_rep_cartesian> RGt;
+typedef CGAL::Regular_triangulation_euclidean_traits_2<TestK> RGt;
 typedef CGAL::Regular_triangulation_vertex_base_2<RGt> Vbb;
 typedef CGAL::Triangulation_hierarchy_vertex_base_2<Vbb> Vb;
 typedef CGAL::Regular_triangulation_face_base_2<RGt>  Fb;
@@ -53,6 +53,7 @@ int main()
   std::cout << " with CGAL::Regular_triangulation_euclidean_traits_2 : "
 	    <<std::endl;
   std::cout << "using  Cartesian  points "   <<  std::endl;
+  //_test_cls_regular_hierarchy_2( Rt());
   _test_cls_regular_hierarchy_2( Regular_hierarchy_cartesian());
   return 0;
 }