Finalize CLN 1.3.7 release.

[cln.git] / src / real / conv / cl_R_to_double.cc

diff --git a/src/real/conv/cl_R_to_double.cc b/src/real/conv/cl_R_to_double.cc
index af22927bcc7cda8dc987097e7c2b3d647811ffc4..4c3051bc95bf7fc9a58df913108bcf97ec6e8692 100644 (file)
--- a/src/real/conv/cl_R_to_double.cc
+++ b/src/real/conv/cl_R_to_double.cc
@@ -1,52 +1,60 @@
 // cl_R_to_double().
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
-#include "cl_real.h"
+#include "cln/real.h"
 
 
 // Implementation.
 
-#include "cl_R.h"
-#include "cl_F.h"
-#include "cl_integer.h"
-#include "cl_rational.h"
-#include "cl_float.h"
-#include "cl_sfloat.h"
-#include "cl_ffloat.h"
-#include "cl_dfloat.h"
-#include "cl_lfloat.h"
+#include "real/cl_R.h"
+#include "float/cl_F.h"
+#include "cln/integer.h"
+#include "cln/rational.h"
+#include "cln/float.h"
+#include "cln/sfloat.h"
+#include "cln/ffloat.h"
+#include "cln/dfloat.h"
+#include "cln/lfloat.h"
 
 #if 0
 
-double cl_double_approx (const cl_R& x)
+namespace cln {
+
+double double_approx (const cl_R& x)
 {
        if (rationalp(x)) {
                DeclareType(cl_RA,x);
-               return cl_double_approx(x);
+               return double_approx(x);
        } else {
                DeclareType(cl_F,x);
-               return cl_double_approx(x);
+               return double_approx(x);
        }
 }
 
+}  // namespace cln
+
 #else // fully inlined, faster
 
-#include "cl_RA.h"
-#include "cl_I.h"
+#include "rational/cl_RA.h"
+#include "integer/cl_I.h"
 
-double cl_double_approx (const cl_R& x)
+namespace cln {
+
+double double_approx (const cl_R& x)
 {
        realcase6(x
-       ,       return cl_double_approx(x);
-       ,       return cl_double_approx(x);
-       ,       return cl_double_approx(x);
-       ,       return cl_double_approx(x);
-       ,       return cl_double_approx(x);
-       ,       return cl_double_approx(x);
+       ,       return double_approx(x);
+       ,       return double_approx(x);
+       ,       return double_approx(x);
+       ,       return double_approx(x);
+       ,       return double_approx(x);
+       ,       return double_approx(x);
        );
 }
 
+}  // namespace cln
+
 #endif