From add90033b42278807d5ffc5e132be1aa29b8d19e Mon Sep 17 00:00:00 2001
From: Efi Fogel <efif@post.tau.ac.il>
Date: Thu, 28 Jun 2012 21:36:56 +0000
Subject: [PATCH] updated

---
 .../test/Arrangement_on_surface_2/IO_test.h    | 18 +++++++++---------
 .../Point_location_dynamic_test.h              |  2 +-
 .../Point_location_test.h                      |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_test.h
index c45572863af..14ca8a2222d 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_test.h
@@ -114,13 +114,13 @@ protected:
  * Constructor. 
  * Accepts test data file name.
  */
-template <class T_Traits>
+template <typename T_Traits>
 IO_test<T_Traits>::IO_test() : m_eol_printed(true) {}
 
 /*!
  * Destructor. 
  */
-template <class T_Traits>
+template <typename T_Traits>
 IO_test<T_Traits>::~IO_test() { clear(); }
 
 /*! Set the file names */
@@ -134,7 +134,7 @@ void IO_test<T_Traits>::set_filenames(const char* points_filename,
   m_filename_curves.assign(curves_filename);
 }
 
-template <class T_Traits>
+template <typename T_Traits>
 bool IO_test<T_Traits>::parse(int argc, char* argv[])
 {
   if (argc < 4) {
@@ -146,21 +146,21 @@ bool IO_test<T_Traits>::parse(int argc, char* argv[])
   m_filename_points.assign(argv[1]);
   m_filename_xcurves.assign(argv[2]);
   m_filename_curves.assign(argv[3]);
-
   return true;
 }
 
 /*! Initialize the data structure */
-template<class T_Traits>
+template <typename T_Traits>
 bool IO_test<T_Traits>::init()
 {
-  read_points(m_filename_points.c_str(), m_points);
-  read_xcurves(m_filename_xcurves.c_str(), m_xcurves);
-  read_curves(m_filename_curves.c_str(), m_curves);
+  if (!read_points(m_filename_points.c_str(), m_points)) return false;
+  if (!read_xcurves(m_filename_xcurves.c_str(), m_xcurves)) return false;
+  if (!read_curves(m_filename_curves.c_str(), m_curves)) return false;
+  return true;
 }
 
 /*! Clear the data structures */
-template<class T_Traits>
+template <typename T_Traits>
 void IO_test<T_Traits>::clear()
 {
   m_filename_points.clear();
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_dynamic_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_dynamic_test.h
index 0a7f605daff..1d1d6b573c8 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_dynamic_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_dynamic_test.h
@@ -63,7 +63,7 @@ bool Point_location_dynamic_test<T_Traits>::construct_arrangement()
 {
   std::ifstream in_com(this->m_filename_commands.c_str());
   if (!in_com.is_open()) {
-    print_error(std::string("cannot open file ").append(this->m_filename_commands));
+    this->print_error(std::string("cannot open file ").append(this->m_filename_commands));
     return false;
   }
   
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h
index 15f42f7b8d6..b24c667bcd9 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h
@@ -646,7 +646,7 @@ bool Point_location_test<T_Traits>::perform()
   for (qi = 0; qi < size; ++qi) {
     // Assign object to a face
     if (CGAL::assign(fh_ref, ob_iter[0][qi])) {
-      for (int pl_index = 1; pl_index < pls_num; ++pl_index) {
+      for (unsigned int pl_index = 1; pl_index < pls_num; ++pl_index) {
         if (! CGAL::assign(fh_curr, ob_iter[pl_index][qi])) {
           std::cout << "Error in point location number " << pl_index;
           if (CGAL::assign(fh_curr, ob_iter[pl_index][qi])) {
@@ -678,7 +678,7 @@ bool Point_location_test<T_Traits>::perform()
     // Assign object to a halfedge
     else if (CGAL::assign (hh_ref, ob_iter[0][qi])) {
       std::cout << "Halfedge: " << hh_ref->curve() << std::endl;
-      for (int pl_index = 1; pl_index < pls_num; ++pl_index) {
+      for (unsigned int pl_index = 1; pl_index < pls_num; ++pl_index) {
         if (! CGAL::assign(hh_curr, ob_iter[pl_index][qi])) {
           std::cout << "Error in point location number " << pl_index;
           if (CGAL::assign(fh_curr, ob_iter[pl_index][qi])) {
@@ -706,7 +706,7 @@ bool Point_location_test<T_Traits>::perform()
 
     // Assign object to a vertex
     else if (CGAL::assign(vh_ref, ob_iter[0][qi])) {
-      for (int pl_index = 1; pl_index < pls_num; ++pl_index) {
+      for (unsigned int pl_index = 1; pl_index < pls_num; ++pl_index) {
         if (! CGAL::assign(vh_curr, ob_iter[pl_index][qi])) {
           std::cout << "Error in point location number " << pl_index;
           if (CGAL::assign(fh_curr, ob_iter[pl_index][qi])) {