Minor fixes for recent CLang.

[cln.git] / include / cln / univpoly.h

diff --git a/include/cln/univpoly.h b/include/cln/univpoly.h
index 0116827a7052abb8fd04b97152b74020c34322ee..8915254f2d0d69850d785cd8518733dcb5cb9534 100644 (file)
--- a/include/cln/univpoly.h
+++ b/include/cln/univpoly.h
@@ -348,13 +348,18 @@ public:
 
 // Lookup or create the "standard" univariate polynomial ring over a ring r.
 extern const cl_univpoly_ring find_univpoly_ring (const cl_ring& r);
-//CL_REQUIRE(cl_UP_unnamed)
 
 // Lookup or create a univariate polynomial ring with a named variable over r.
 extern const cl_univpoly_ring find_univpoly_ring (const cl_ring& r, const cl_symbol& varname);
-//CL_REQUIRE(cl_UP_named)
 
-CL_REQUIRE(cl_UP)
+class cl_UP_init_helper
+{
+       static int count;
+public:
+       cl_UP_init_helper();
+       ~cl_UP_init_helper();
+};
+static cl_UP_init_helper cl_UP_init_helper_instance;
 
 
 // Operations on polynomials.
@@ -451,7 +456,15 @@ extern const cl_UP deriv (const cl_UP& x);
 
 extern const cl_univpoly_ring cl_no_univpoly_ring;
 extern cl_class cl_class_no_univpoly_ring;
-CL_REQUIRE(cl_UP_no_ring)
+
+class cl_UP_no_ring_init_helper
+{
+       static int count;
+public:
+       cl_UP_no_ring_init_helper();
+       ~cl_UP_no_ring_init_helper();
+};
+static cl_UP_no_ring_init_helper cl_UP_no_ring_init_helper_instance;
 
 inline cl_univpoly_ring::cl_univpoly_ring ()
        : cl_ring (as_cl_private_thing(cl_no_univpoly_ring)) {}