From: Richard Kreckel <kreckel@ginac.de>
Date: Sat, 10 Oct 2020 18:20:59 +0000 (+0200)
Subject: Remove deprecated initialization via overloaded comma operator.
X-Git-Tag: release_1-8-0~12
X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=e62c12d0c93db3a1da2bc25532ffbf23e41c6292;ds=sidebyside

Remove deprecated initialization via overloaded comma operator.

This feature has been marked as deprecated since 1.7.0. There's been more
than four years to switch to initializer lists. Let's hope people have
modified their code since.
---

diff --git a/ginac/container.h b/ginac/container.h
index 6909b743..6c312e74 100644
--- a/ginac/container.h
+++ b/ginac/container.h
@@ -68,63 +68,6 @@ template <>
 inline void container_storage<std::vector>::reserve(std::vector<ex> & v, size_t n) { v.reserve(n); }
 
 
-/** Helper template to allow initialization of containers via an overloaded
- *  comma operator (idea stolen from Blitz++). */
-template <typename T, typename STLT>
-class container_init {
-public:
-	container_init(STLT & s) : stlt(s) {}
-
-	container_init<T, STLT> operator,(const T & x)
-	{
-		stlt.push_back(x);
-		return container_init<T, STLT>(stlt);
-	}
-
-	// The following specializations produce much tighter code than the
-	// general case above
-
-	container_init<T, STLT> operator,(int x)
-	{
-		stlt.push_back(x);
-		return container_init<T, STLT>(stlt);
-	}
-
-	container_init<T, STLT> operator,(unsigned int x)
-	{
-		stlt.push_back(x);
-		return container_init<T, STLT>(stlt);
-	}
-
-	container_init<T, STLT> operator,(long x)
-	{
-		stlt.push_back(x);
-		return container_init<T, STLT>(stlt);
-	}
-
-	container_init<T, STLT> operator,(unsigned long x)
-	{
-		stlt.push_back(x);
-		return container_init<T, STLT>(stlt);
-	}
-
-	container_init<T, STLT> operator,(double x)
-	{
-		stlt.push_back(x);
-		return container_init<T, STLT>(stlt);
-	}
-
-	container_init<T, STLT> operator,(const symbol & x)
-	{
-		stlt.push_back(T(x));
-		return container_init<T, STLT>(stlt);
-	}
-
-private:
-	container_init();
-	STLT & stlt;
-};
-
 /** Wrapper template for making GiNaC classes out of STL containers. */
 template <template <class T, class = std::allocator<T>> class C>
 class container : public basic, public container_storage<C> {
@@ -168,36 +111,6 @@ public:
 		setflag(get_default_flags());
 	}
 
-	explicit container(const ex & p1) attribute_deprecated;
-	container(const ex & p1, const ex & p2) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-	          const ex & p9) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-	          const ex & p9, const ex & p10) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-	          const ex & p9, const ex & p10, const ex & p11) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-	          const ex & p9, const ex & p10, const ex & p11, const ex & p12) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-	          const ex & p9, const ex & p10, const ex & p11, const ex & p12, const ex & p13) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-	          const ex & p9, const ex & p10, const ex & p11, const ex & p12, const ex & p13, const ex & p14) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-	          const ex & p9, const ex & p10, const ex & p11, const ex & p12, const ex & p13, const ex & p14, const ex & p15) attribute_deprecated;
-	container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-	          const ex & p9, const ex & p10, const ex & p11, const ex & p12, const ex & p13, const ex & p14, const ex & p15, const ex & p16) attribute_deprecated;
-
-	// First step of initialization of container with a comma-separated
-	// sequence of expressions. Subsequent steps are handled by
-	// container_init<>::operator,().
-	container_init<ex, STLT> operator=(const ex & x) attribute_deprecated;
-
 	// functions overriding virtual functions from base classes
 public:
 	bool info(unsigned inf) const override { return inherited::info(inf); }
@@ -343,85 +256,6 @@ container<C>::container()
 	setflag(get_default_flags());
 }
 
-/** Deprecatd constructors (prefer initializer list) */
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1)
-  : container_storage<C>(1, p1) { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2)
-  : container_storage<C>{p1, p2} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3)
-  : container_storage<C>{p1, p2, p3} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4)
-  : container_storage<C>{p1, p2, p3, p4} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5)
-  : container_storage<C>{p1, p2, p3, p4, p5} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-                        const ex & p9)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8, p9} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-                        const ex & p9, const ex & p10)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8, p9, p10} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-                        const ex & p9, const ex & p10, const ex & p11)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-                        const ex & p9, const ex & p10, const ex & p11, const ex & p12)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-                        const ex & p9, const ex & p10, const ex & p11, const ex & p12, const ex & p13)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-                        const ex & p9, const ex & p10, const ex & p11, const ex & p12, const ex & p13, const ex & p14)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-                        const ex & p9, const ex & p10, const ex & p11, const ex & p12, const ex & p13, const ex & p14, const ex & p15)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15} { setflag(get_default_flags()); }
-template <template <class T, class = std::allocator<T>> class C>
-container<C>::container(const ex & p1, const ex & p2, const ex & p3, const ex & p4, const ex & p5, const ex & p6, const ex & p7, const ex & p8,
-                        const ex & p9, const ex & p10, const ex & p11, const ex & p12, const ex & p13, const ex & p14, const ex & p15, const ex & p16)
-  : container_storage<C>{p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16} { setflag(get_default_flags()); }
-
-template <template <class T, class = std::allocator<T>> class C>
-container_init<ex, typename container_storage<C>::STLT> container<C>::operator=(const ex & x)
-{
-	this->seq.push_back(x);
-	return container_init<ex, typename container_storage<C>::STLT>(this->seq);
-}
-
 template <template <class T, class = std::allocator<T>> class C>
 void container<C>::do_print(const print_context & c, unsigned level) const
 {
diff --git a/ginac/matrix.h b/ginac/matrix.h
index edb4adb7..eb3c40c6 100644
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -33,64 +33,6 @@
 
 namespace GiNaC {
 
-/** Helper template to allow initialization of matrices via an overloaded
- *  comma operator (idea stolen from Blitz++). */
-template <typename T, typename It>
-class matrix_init {
-public:
-	matrix_init(It i) : iter(i) {}
-
-	matrix_init<T, It> operator,(const T & x)
-	{
-		*iter = x;
-		return matrix_init<T, It>(++iter);
-	}
-
-	// The following specializations produce much tighter code than the
-	// general case above
-
-	matrix_init<T, It> operator,(int x)
-	{
-		*iter = T(x);
-		return matrix_init<T, It>(++iter);
-	}
-
-	matrix_init<T, It> operator,(unsigned int x)
-	{
-		*iter = T(x);
-		return matrix_init<T, It>(++iter);
-	}
-
-	matrix_init<T, It> operator,(long x)
-	{
-		*iter = T(x);
-		return matrix_init<T, It>(++iter);
-	}
-
-	matrix_init<T, It> operator,(unsigned long x)
-	{
-		*iter = T(x);
-		return matrix_init<T, It>(++iter);
-	}
-
-	matrix_init<T, It> operator,(double x)
-	{
-		*iter = T(x);
-		return matrix_init<T, It>(++iter);
-	}
-
-	matrix_init<T, It> operator,(const symbol & x)
-	{
-		*iter = T(x);
-		return matrix_init<T, It>(++iter);
-	}
-
-private:
-	matrix_init();
-	It iter;
-};
-
-
 /** Symbolic matrices. */
 class matrix : public basic
 {
@@ -102,7 +44,6 @@ public:
 	matrix(unsigned r, unsigned c, const lst & l);
 	matrix(std::initializer_list<std::initializer_list<ex>> l);
 
-	matrix_init<ex, exvector::iterator> operator=(const ex & x) attribute_deprecated;
 protected:
 	matrix(unsigned r, unsigned c, const exvector & m2);
 	matrix(unsigned r, unsigned c, exvector && m2);
@@ -177,14 +118,6 @@ protected:
 };
 GINAC_DECLARE_UNARCHIVER(matrix); 
 
-// First step of initialization of matrix with a comma-separated sequence
-// of expressions. Subsequent steps are handled by matrix_init<>::operator,().
-inline matrix_init<ex, exvector::iterator> matrix::operator=(const ex & x)
-{
-	m[0] = x;
-	return matrix_init<ex, exvector::iterator>(++m.begin());
-}
-
 // wrapper functions around member functions
 
 inline size_t nops(const matrix & m)