* include/cln/*.h: Change signatures of all classes' methods

          cln::cl_foo::operator new(size_t, cl_foo*) to
          cln::cl_foo::operator new(size_t, void*) so one can declare
          std::vector<cln::cl_foo>, std::list<cln::cl_foo> etc. for
          certain STL implementations (like libstdc++-v3).

diff --git a/ChangeLog b/ChangeLog
index 35435f0358578f024987a4d738fd85e7eb2fc992..fc5e35e711eb978276feaa0d0e9a34a7aff39a1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-01-22  Richard Kreckel  <kreckel@ginac.de>
+
+        * configure.in: Make build in separate builddir possible (again).
+
+2001-01-22  Richard Kreckel  <kreckel@ginac.de>
+
+        * include/cln/*.h: Change signatures of all classes' methods
+          cln::cl_foo::operator new(size_t, cl_foo*) to
+          cln::cl_foo::operator new(size_t, void*) so one can declare
+          std::vector<cln::cl_foo>, std::list<cln::cl_foo> etc. for
+          certain STL implementations (like libstdc++-v3).
+
 2000-12-14  Richard Kreckel  <kreckel@ginac.de>
 
         * Version 1.1 released.

diff --git a/NEWS b/NEWS
index 2102127aae813fa7f665fabf378c302246564daf..c01b99bbbddd2b6b9e2d1029b83f3a49bff69871 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+2001-xx-xx, version 1.1.1
+=========================
+
+Implementation changes
+----------------------
+
+* Minor cleanup for GCC 3.0.
+
+
 2000-12-14, version 1.1.0
 =========================
 

diff --git a/include/cln/GV.h b/include/cln/GV.h
index 6616c52e4317c4778f38586f205eb7199f852538..cd31e6de237104e3f40eeb750fdc24eacb6db2c7 100644 (file)
--- a/include/cln/GV.h
+++ b/include/cln/GV.h
@@ -44,7 +44,7 @@ public:
        // Destructor.
        ~cl_GV_inner ();
        // Ability to place an object at a given address.
-       void* operator new (size_t size, cl_GV_inner* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
 private:
 // No default constructor, copy constructor, assignment operator, new.
        cl_GV_inner ();

diff --git a/include/cln/SV.h b/include/cln/SV.h
index 43ae0dcac2ceb723e4612f9f1ab63ca9bdf461fd..ad0bf199e8e3656946cefd2f2b5ec568a48d0ec0 100644 (file)
--- a/include/cln/SV.h
+++ b/include/cln/SV.h
@@ -81,7 +81,7 @@ public:
        // Destructor.
        ~cl_SV_inner ();
        // Ability to place an object at a given address.
-       void* operator new (size_t size, cl_SV_inner* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
 private:
 // No default constructor, copy constructor, assignment operator, new.
        cl_SV_inner ();

diff --git a/include/cln/complex_class.h b/include/cln/complex_class.h
index 0f4b3c1b7a151de593463d98d595ce4d21f3b003..b5dec56e8a4f7f67223db3d9f5e477d5e273b52c 100644 (file)
--- a/include/cln/complex_class.h
+++ b/include/cln/complex_class.h
@@ -36,7 +36,7 @@ public:
        cl_N (struct cl_heap_complex *);
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_N* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 private:
 // Friend declarations. They are for the compiler. Just ignore them.

diff --git a/include/cln/dfloat_class.h b/include/cln/dfloat_class.h
index f36f80fee0513e1f3fc2d283355f16a903e900d4..515fb3730d58aead73604d05cb882e809888c1c1 100644 (file)
--- a/include/cln/dfloat_class.h
+++ b/include/cln/dfloat_class.h
@@ -31,7 +31,7 @@ public:
        operator struct cl_heap_dfloat * () const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_DF* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 private:
 // Friend declarations. They are for the compiler. Just ignore them.

diff --git a/include/cln/ffloat_class.h b/include/cln/ffloat_class.h
index aaa2481c7df6f47294cbaab5ea358776d19c69bc..94cbfd80a112c1e644656ce736c0eecbdd8eae27 100644 (file)
--- a/include/cln/ffloat_class.h
+++ b/include/cln/ffloat_class.h
@@ -39,7 +39,7 @@ public:
 #endif
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_FF* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/float_class.h b/include/cln/float_class.h
index 7a7e955a1c37a758b26f6d28d1c5859c50e5ae6a..61c5e378d8d37ba72756de36fb0d95c26c7edf70 100644 (file)
--- a/include/cln/float_class.h
+++ b/include/cln/float_class.h
@@ -28,7 +28,7 @@ public:
        cl_F (cl_private_thing);
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_F* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 private:
 // Friend declarations. They are for the compiler. Just ignore them.

diff --git a/include/cln/integer_class.h b/include/cln/integer_class.h
index ebf9b6ef260ff26bd46611b1498fd9ee3698c69a..db2068e720a022aae1d28083bc47280e1cd31a43 100644 (file)
--- a/include/cln/integer_class.h
+++ b/include/cln/integer_class.h
@@ -33,7 +33,7 @@ public:
        cl_I (struct cl_heap_bignum *);
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_I* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/lfloat_class.h b/include/cln/lfloat_class.h
index 6d719d08c096f3e8e00f8a17f426f7e0bb34ded4..e73f0a1f70922e8bedd404e15ea908db4375ba40 100644 (file)
--- a/include/cln/lfloat_class.h
+++ b/include/cln/lfloat_class.h
@@ -28,7 +28,7 @@ public:
        operator struct cl_heap_lfloat * () const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_LF* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 // Define this if you want the elementary cl_LF operations (+, -, *, /,

diff --git a/include/cln/modinteger.h b/include/cln/modinteger.h
index c1823ab40383f5f07ae372d946abe769641b1910..cc613be9f8e03f0c6365fe3c050d9ec978c7a443 100644 (file)
--- a/include/cln/modinteger.h
+++ b/include/cln/modinteger.h
@@ -103,7 +103,7 @@ public:
        CL_DEFINE_CONVERTER(_cl_ring_element)
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, _cl_MI* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 
@@ -125,7 +125,7 @@ public:
        void debug_print () const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_MI* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/object.h b/include/cln/object.h
index fb509bd67594ffc153b30f973112b8f525c87386..02dd64ec52ed96df5a516587ea87f4ed1b5d71c9 100644 (file)
--- a/include/cln/object.h
+++ b/include/cln/object.h
@@ -335,7 +335,7 @@ public:
 // Debugging output.
        void debug_print () const;
 // Ability to place an object at a given address.
-       void* operator new (size_t size, cl_gcobject* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void* operator new (size_t size) { return ::operator new (size); }
 };
 inline cl_gcobject::cl_gcobject () {}
@@ -385,7 +385,7 @@ public:
 // Debugging output.
        void debug_print () const;
 // Ability to place an object at a given address.
-       void* operator new (size_t size, cl_gcpointer* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void* operator new (size_t size) { return ::operator new (size); }
 };
 inline cl_gcpointer::cl_gcpointer () {}
@@ -435,7 +435,7 @@ public:
 // Debugging output.
        void debug_print () const;
 // Ability to place an object at a given address.
-       void* operator new (size_t size, cl_rcobject* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void* operator new (size_t size) { return ::operator new (size); }
 };
 inline cl_rcobject::cl_rcobject () {}
@@ -485,7 +485,7 @@ public:
 // Debugging output.
        void debug_print () const;
 // Ability to place an object at a given address.
-       void* operator new (size_t size, cl_rcpointer* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void* operator new (size_t size) { return ::operator new (size); }
 };
 inline cl_rcpointer::cl_rcpointer () {}

diff --git a/include/cln/rational_class.h b/include/cln/rational_class.h
index 93470f15308038dda543f8a0e07f6b18cbb1b5b1..3546598bda40f3639afbcbf3ff0cc8af3a2cff83 100644 (file)
--- a/include/cln/rational_class.h
+++ b/include/cln/rational_class.h
@@ -33,7 +33,7 @@ public:
        cl_RA (struct cl_heap_ratio *);
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_RA* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 private:
 // Friend declarations. They are for the compiler. Just ignore them.

diff --git a/include/cln/real_class.h b/include/cln/real_class.h
index 41c0c515ca918a59f02c43985665f0b7bcc964aa..bae1e512c9f2e9d8c9fbfb229d7f472256a875a4 100644 (file)
--- a/include/cln/real_class.h
+++ b/include/cln/real_class.h
@@ -36,7 +36,7 @@ public:
        cl_R (cl_private_thing);
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_R* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 private:
 // Friend declarations. They are for the compiler. Just ignore them.

diff --git a/include/cln/ring.h b/include/cln/ring.h
index 69c621cb602a1091545518e42c9aca221d75e960..70b6120cace7fc933ee20030e1b2c53c4c80347b 100644 (file)
--- a/include/cln/ring.h
+++ b/include/cln/ring.h
@@ -121,7 +121,7 @@ public: /* ugh */
        _cl_ring_element (const cl_ring& R, const cl_gcobject& r) : rep (as_cl_private_thing(r)) { (void)R; }
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, _cl_ring_element* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 
@@ -140,7 +140,7 @@ public:     // Debugging output.
        void debug_print () const;
        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_ring_element* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/sfloat_class.h b/include/cln/sfloat_class.h
index 9032e150da3132a70f729b7fa0375f71ef4502e6..57266fc97fd80e8803db944ac9eab55645051470 100644 (file)
--- a/include/cln/sfloat_class.h
+++ b/include/cln/sfloat_class.h
@@ -26,7 +26,7 @@ public:
        cl_SF (struct cl_sfloat * /* NULL! */, cl_uint);
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_SF* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/univpoly.h b/include/cln/univpoly.h
index d1a173b96422f26b673c097a8265ba8ab71d3725..bfc88ac411f5f2aa386daa08c9d225994eddc663 100644 (file)
--- a/include/cln/univpoly.h
+++ b/include/cln/univpoly.h
@@ -72,7 +72,7 @@ public:
        CL_DEFINE_CONVERTER(_cl_ring_element)
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, _cl_UP* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 
@@ -102,7 +102,7 @@ public:
        void debug_print () const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_UP* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 
@@ -523,7 +523,7 @@ public:
        const T operator() (const T& y) const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_UP_specialized<T>* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/univpoly_complex.h b/include/cln/univpoly_complex.h
index 8deab199e389670808dace93eb44c6a504307455..5de6dac820637551417f0eaf6646f288a61e3bd5 100644 (file)
--- a/include/cln/univpoly_complex.h
+++ b/include/cln/univpoly_complex.h
@@ -53,7 +53,7 @@ public:
        const cl_N operator() (const cl_N& y) const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_UP_N* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/univpoly_integer.h b/include/cln/univpoly_integer.h
index 16b704e83c9293f7c2d69b172b6a9f4c1ee5199e..d227fa5bc76a4eedf2d0ecd248c9c53c3f42f904 100644 (file)
--- a/include/cln/univpoly_integer.h
+++ b/include/cln/univpoly_integer.h
@@ -52,7 +52,7 @@ public:
        const cl_I operator() (const cl_I& y) const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_UP_I* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/univpoly_modint.h b/include/cln/univpoly_modint.h
index b603e8e6b82ac6982393f1f10bfd6267b95e30d0..4fcd1cdd5bea80c65fa2a64c0c73ffc236714257 100644 (file)
--- a/include/cln/univpoly_modint.h
+++ b/include/cln/univpoly_modint.h
@@ -43,7 +43,7 @@ public:
        const cl_MI operator() (const cl_MI& y) const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_UP_MI* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/univpoly_rational.h b/include/cln/univpoly_rational.h
index fe76e23a69fe99a5eeb9895ac85dd07213cfd292..0c53590005140725bc56c6ee367bd9291542ec23 100644 (file)
--- a/include/cln/univpoly_rational.h
+++ b/include/cln/univpoly_rational.h
@@ -53,7 +53,7 @@ public:
        const cl_RA operator() (const cl_RA& y) const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_UP_RA* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };
 

diff --git a/include/cln/univpoly_real.h b/include/cln/univpoly_real.h
index 742b3737f8c1f530121c0a0c81073b3bc28fa01c..4f2419f2a867c38fbd3de25c5f6c1a820f49616c 100644 (file)
--- a/include/cln/univpoly_real.h
+++ b/include/cln/univpoly_real.h
@@ -53,7 +53,7 @@ public:
        const cl_R operator() (const cl_R& y) const;
 public:        // Ability to place an object at a given address.
        void* operator new (size_t size) { return malloc_hook(size); }
-       void* operator new (size_t size, cl_UP_R* ptr) { (void)size; return ptr; }
+       void* operator new (size_t size, void* ptr) { (void)size; return ptr; }
        void operator delete (void* ptr) { free_hook(ptr); }
 };