From 1c8d4b6a30d42d59f78ec6c7381025ee7f729d82 Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Wed, 27 Aug 2003 08:10:29 +0000
Subject: [PATCH] - CGAL::NTS updates.

---
 Packages/Interval_arithmetic/changes.txt           |  3 +++
 .../CGAL/Arithmetic_filter/predicates/builtin.h    |  4 ----
 .../include/CGAL/Filtered_exact.h                  |  5 -----
 .../include/CGAL/Interval_arithmetic.h             | 14 --------------
 .../include/CGAL/Lazy_exact_nt.h                   |  4 ----
 .../test/Interval_arithmetic/include/tst_generic.C |  7 +++++++
 6 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/Packages/Interval_arithmetic/changes.txt b/Packages/Interval_arithmetic/changes.txt
index 7b3741800e7..64eaf63a32d 100644
--- a/Packages/Interval_arithmetic/changes.txt
+++ b/Packages/Interval_arithmetic/changes.txt
@@ -1,3 +1,6 @@
+Version 4.179 on 27 August 2003
+- CGAL::NTS updates.
+
 Version 4.178 on 7 August 2003
 - Interval_converter -> To_interval.
 
diff --git a/Packages/Interval_arithmetic/include/CGAL/Arithmetic_filter/predicates/builtin.h b/Packages/Interval_arithmetic/include/CGAL/Arithmetic_filter/predicates/builtin.h
index 89f50575e10..35046c2c94a 100644
--- a/Packages/Interval_arithmetic/include/CGAL/Arithmetic_filter/predicates/builtin.h
+++ b/Packages/Interval_arithmetic/include/CGAL/Arithmetic_filter/predicates/builtin.h
@@ -23,8 +23,6 @@
 
 CGAL_BEGIN_NAMESPACE
 
-namespace NTS { // because the script transforms CGAL_NTS sign() into ...
-
 struct Static_Filtered_sign_1
 {
   static double _bound;
@@ -85,8 +83,6 @@ struct Static_Filtered_compare_2
   }
 };
 
-} // namespace NTS
-
 CGAL_END_NAMESPACE
 
 #endif // CGAL_ARITHMETIC_FILTER_PREDICATES_BUILTIN_H
diff --git a/Packages/Interval_arithmetic/include/CGAL/Filtered_exact.h b/Packages/Interval_arithmetic/include/CGAL/Filtered_exact.h
index a7a07696e22..8f37977f81d 100644
--- a/Packages/Interval_arithmetic/include/CGAL/Filtered_exact.h
+++ b/Packages/Interval_arithmetic/include/CGAL/Filtered_exact.h
@@ -424,8 +424,6 @@ sqrt (const Filtered_exact<CT, ET, Type, Protected, Cache>& fil)
 
 
 
-namespace NTS {
-
 #ifndef CGAL_CFG_MATCHING_BUG_2
 template < class CGAL_IA_CT, class CGAL_IA_ET, bool CGAL_IA_PROTECTED,
            class CGAL_IA_CACHE >
@@ -465,7 +463,6 @@ square (const Filtered_exact<CGAL_IA_CT, CGAL_IA_ET, Dynamic,
 { return CGAL_NTS square(fil.value()); }
 
 
-} // namespace NTS
 #endif // CGAL_DENY_INEXACT_OPERATIONS_ON_FILTER
 
 template < class CT, class ET, class Type, bool Protected, class Cache >
@@ -492,7 +489,6 @@ std::pair<double, double>
 to_interval (const Filtered_exact<CT, ET, Type, Protected, Cache>& fil)
 { return CGAL::to_interval(fil.value()); }
 
-namespace NTS {
 
 #ifndef CGAL_CFG_MATCHING_BUG_2
 template < class CGAL_IA_CT, class CGAL_IA_ET, bool CGAL_IA_PROTECTED,
@@ -534,7 +530,6 @@ abs (const Filtered_exact<CGAL_IA_CT, CGAL_IA_ET, Dynamic,
                           CGAL_IA_PROTECTED, CGAL_IA_CACHE>& fil)
 { return CGAL_NTS abs(fil.value()); }
 
-} // namespace NTS
 
 #ifndef CGAL_CFG_MATCHING_BUG_2
 template < class CGAL_IA_CT, class CGAL_IA_ET, bool CGAL_IA_PROTECTED,
diff --git a/Packages/Interval_arithmetic/include/CGAL/Interval_arithmetic.h b/Packages/Interval_arithmetic/include/CGAL/Interval_arithmetic.h
index b59c90a1b8f..40bb2bee89a 100644
--- a/Packages/Interval_arithmetic/include/CGAL/Interval_arithmetic.h
+++ b/Packages/Interval_arithmetic/include/CGAL/Interval_arithmetic.h
@@ -553,8 +553,6 @@ max (const Interval_nt<true> & d, const Interval_nt<true> & e)
 
 #endif // CGAL_CFG_MATCHING_BUG_2
 
-namespace NTS {
-
 #ifndef CGAL_CFG_MATCHING_BUG_2
 template <bool Protected>
 inline
@@ -700,8 +698,6 @@ compare (const Interval_nt<false> & d, const Interval_nt<false> & e)
 }
 #endif // CGAL_CFG_MATCHING_BUG_2
 
-} // namespace NTS
-
 inline
 std::pair<double,double>
 to_interval (const long & l)
@@ -721,16 +717,6 @@ to_interval (const long & l)
     return std::pair<double,double>(l,l);
 }
 
-
-// needed for making the testsuite pass for Intel7
-
-namespace CGALi {
-
-  extern double zero();
-}
-
-
-
 CGAL_END_NAMESPACE
 
 #endif // CGAL_INTERVAL_ARITHMETIC_H
diff --git a/Packages/Interval_arithmetic/include/CGAL/Lazy_exact_nt.h b/Packages/Interval_arithmetic/include/CGAL/Lazy_exact_nt.h
index 75da278cd4a..5b02dca4879 100644
--- a/Packages/Interval_arithmetic/include/CGAL/Lazy_exact_nt.h
+++ b/Packages/Interval_arithmetic/include/CGAL/Lazy_exact_nt.h
@@ -545,8 +545,6 @@ to_interval(const Lazy_exact_nt<ET> & a)
 }
 
 #ifndef CGAL_CFG_MATCHING_BUG_2
-namespace NTS {
-
 template <typename ET>
 inline
 Sign
@@ -591,8 +589,6 @@ Lazy_exact_nt<ET>
 square(const Lazy_exact_nt<ET> & a)
 { return new Lazy_exact_Square<ET>(a); }
 
-} // namespace NTS
-
 #endif // CGAL_CFG_MATCHING_BUG_2
 
 template <typename ET>
diff --git a/Packages/Interval_arithmetic/test/Interval_arithmetic/include/tst_generic.C b/Packages/Interval_arithmetic/test/Interval_arithmetic/include/tst_generic.C
index 633fe1ded2c..30a297bdfc3 100644
--- a/Packages/Interval_arithmetic/test/Interval_arithmetic/include/tst_generic.C
+++ b/Packages/Interval_arithmetic/test/Interval_arithmetic/include/tst_generic.C
@@ -316,6 +316,13 @@ bool utility_test()
 
 double zero = 0.0; // I put it here to avoid compiler warnings.
 
+// needed for making the testsuite pass for Intel7
+namespace CGAL {
+  namespace CGALi {
+    extern double zero();
+  }
+}
+
 bool is_valid_test()
 {
   CGAL::Failure_behaviour backup = CGAL::set_error_behaviour(CGAL::CONTINUE);