From b5be0777f3aa9d16c047f3e09f4bf3648b40bcf2 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 23 Jan 2023 16:56:56 +0200
Subject: [PATCH] Use default members initializers and defaulted special
 members

---
 source/geometry/affinetransform.h  | 15 +++++++--------
 source/geometry/angle.h            |  4 ++--
 source/geometry/boundingbox.h      | 14 ++++----------
 source/geometry/boundingsphere.h   | 11 +++--------
 source/geometry/box.h              |  2 +-
 source/geometry/circle.h           |  2 +-
 source/geometry/compositeshape.h   |  2 +-
 source/geometry/extrudedshape.h    |  4 ++--
 source/geometry/hypersphere.h      |  4 ++--
 source/geometry/intersection.h     |  2 +-
 source/geometry/loader.h           |  2 +-
 source/geometry/negation.h         |  2 +-
 source/geometry/quaternion.h       |  7 +++++--
 source/geometry/ray.h              |  8 +++-----
 source/geometry/rectangle.h        |  2 +-
 source/geometry/shape.h            |  4 ++--
 source/geometry/surfacepoint.h     |  4 ++--
 source/geometry/transformedshape.h |  2 +-
 source/geometry/union.h            |  2 +-
 source/interpolate/polynomial.h    |  2 +-
 source/interpolate/spline.h        | 22 +++++-----------------
 source/linal/dynamicmatrix.h       |  6 +++---
 source/linal/dynamicvector.h       |  4 ++--
 source/linal/vector.h              |  8 ++++----
 24 files changed, 56 insertions(+), 79 deletions(-)

diff --git a/source/geometry/affinetransform.h b/source/geometry/affinetransform.h
index f9660c6..a380615 100644
--- a/source/geometry/affinetransform.h
+++ b/source/geometry/affinetransform.h
@@ -21,14 +21,14 @@ template<typename T, unsigned D>
 class AffineTransformOps
 {
 protected:
-	AffineTransformOps() { }
+	AffineTransformOps() = default;
 };
 
 template<typename T>
 class AffineTransformOps<T, 2>
 {
 protected:
-	AffineTransformOps() { }
+	AffineTransformOps() = default;
 
 public:
 	static AffineTransform<T, 2> rotation(Angle<T>);
@@ -38,7 +38,7 @@ template<typename T>
 class AffineTransformOps<T, 3>
 {
 protected:
-	AffineTransformOps() { }
+	AffineTransformOps() = default;
 
 public:
 	static AffineTransform<T, 3> rotation(Angle<T>, const LinAl::Vector<T, 3> &);
@@ -78,12 +78,11 @@ public:
 	BoundingBox<T, D> transform(const BoundingBox<T, D> &) const;
 };
 
-template<typename T, unsigned D>
-inline AffineTransform<T, D>::AffineTransform()
-{
-	this->matrix = LinAl::Matrix<T, D+1, D+1>::identity();
-}
 
+template<typename T, unsigned D>
+inline AffineTransform<T, D>::AffineTransform():
+	matrix(LinAl::Matrix<T, D+1, D+1>::identity())
+{ }
 
 template<typename T, unsigned D>
 AffineTransform<T, D> AffineTransform<T, D>::translation(const LinAl::Vector<T, D> &v)
diff --git a/source/geometry/angle.h b/source/geometry/angle.h
index bcd7cca..c9d898c 100644
--- a/source/geometry/angle.h
+++ b/source/geometry/angle.h
@@ -14,11 +14,11 @@ template<typename T>
 class Angle
 {
 private:
-	T value;
+	T value = T(0);
 
 	explicit Angle(T v): value(v) { }
 public:
-	Angle(): value(0) { }
+	Angle() = default;
 	template<typename U>
 	Angle(Angle<U> other): value(other.radians()) { }
 
diff --git a/source/geometry/boundingbox.h b/source/geometry/boundingbox.h
index ae9da2b..d24aab9 100644
--- a/source/geometry/boundingbox.h
+++ b/source/geometry/boundingbox.h
@@ -14,11 +14,11 @@ class BoundingBox
 private:
 	LinAl::Vector<T, D> min_pt;
 	LinAl::Vector<T, D> max_pt;
-	bool empty;
-	bool negated;
+	bool empty = true;
+	bool negated = false;
 
 public:
-	BoundingBox();
+	BoundingBox() = default;
 	BoundingBox(const LinAl::Vector<T, D> &, const LinAl::Vector<T, D> &);
 
 	static BoundingBox negate(const BoundingBox &);
@@ -35,18 +35,12 @@ public:
 	bool is_negated() const { return negated; }
 };
 
-template<typename T, unsigned D>
-inline BoundingBox<T, D>::BoundingBox():
-	empty(true),
-	negated(false)
-{ }
 
 template<typename T, unsigned D>
 inline BoundingBox<T, D>::BoundingBox(const LinAl::Vector<T, D> &n, const LinAl::Vector<T, D> &x):
 	min_pt(n),
 	max_pt(x),
-	empty(false),
-	negated(false)
+	empty(false)
 {
 	for(unsigned i=0; i<D; ++i)
 		if(min_pt[i]>max_pt[i])
diff --git a/source/geometry/boundingsphere.h b/source/geometry/boundingsphere.h
index 66c14d5..311b70e 100644
--- a/source/geometry/boundingsphere.h
+++ b/source/geometry/boundingsphere.h
@@ -12,11 +12,11 @@ class BoundingSphere
 {
 private:
 	LinAl::Vector<T, N> center;
-	T radius;
-	bool empty;
+	T radius = T(0);
+	bool empty = true;
 
 public:
-	BoundingSphere();
+	BoundingSphere() = default;
 	BoundingSphere(const LinAl::Vector<T, N> &, T);
 
 	template<typename Iter>
@@ -27,11 +27,6 @@ public:
 	bool is_empty() const { return empty; }
 };
 
-template<typename T, unsigned N>
-BoundingSphere<T, N>::BoundingSphere():
-	radius(0),
-	empty(true)
-{ }
 
 template<typename T, unsigned N>
 BoundingSphere<T, N>::BoundingSphere(const LinAl::Vector<T, N> &c, T r):
diff --git a/source/geometry/box.h b/source/geometry/box.h
index b46eb67..14fb8ac 100644
--- a/source/geometry/box.h
+++ b/source/geometry/box.h
@@ -15,7 +15,7 @@ template<typename T>
 class Box: public HyperBox<T, 3>
 {
 public:
-	Box() { }
+	Box() = default;
 	explicit Box(const LinAl::Vector<T, 3> &d): HyperBox<T, 3>(d) { }
 	Box(T w, T h, T d): HyperBox<T, 3>(LinAl::Vector<T, 3>(w, h, d)) { }
 
diff --git a/source/geometry/circle.h b/source/geometry/circle.h
index 3a2cfc2..317c088 100644
--- a/source/geometry/circle.h
+++ b/source/geometry/circle.h
@@ -15,7 +15,7 @@ template<typename T>
 class Circle: public HyperSphere<T, 2>
 {
 public:
-	Circle() { }
+	Circle() = default;
 	explicit Circle(T r): HyperSphere<T, 2>(r) { }
 };
 
diff --git a/source/geometry/compositeshape.h b/source/geometry/compositeshape.h
index c472b43..b620636 100644
--- a/source/geometry/compositeshape.h
+++ b/source/geometry/compositeshape.h
@@ -22,7 +22,7 @@ protected:
 	ShapeArray shapes;
 	unsigned max_isect;
 
-	CompositeShape() { }
+	CompositeShape() = default;
 	CompositeShape(const Shape<T, D> &, const Shape<T, D> &);
 	template<typename Iter>
 	void init_from_iter_range(const Iter &, const Iter &);
diff --git a/source/geometry/extrudedshape.h b/source/geometry/extrudedshape.h
index fd4597b..e57ee94 100644
--- a/source/geometry/extrudedshape.h
+++ b/source/geometry/extrudedshape.h
@@ -17,8 +17,8 @@ template<typename T, unsigned D>
 class ExtrudedShape: public Shape<T, D>
 {
 private:
-	Shape<T, D-1> *base;
-	T length;
+	Shape<T, D-1> *base = 0;
+	T length = T(1);
 
 public:
 	ExtrudedShape(const Shape<T, D-1> &, T);
diff --git a/source/geometry/hypersphere.h b/source/geometry/hypersphere.h
index 13e4278..0b327cf 100644
--- a/source/geometry/hypersphere.h
+++ b/source/geometry/hypersphere.h
@@ -17,10 +17,10 @@ template<typename T, unsigned D>
 class HyperSphere: public Shape<T, D>
 {
 private:
-	T radius;
+	T radius = T(1);
 
 public:
-	HyperSphere(): radius(1) { }
+	HyperSphere() = default;
 	explicit HyperSphere(T);
 
 	virtual HyperSphere *clone() const;
diff --git a/source/geometry/intersection.h b/source/geometry/intersection.h
index 24e668d..9bf3416 100644
--- a/source/geometry/intersection.h
+++ b/source/geometry/intersection.h
@@ -21,7 +21,7 @@ template<typename T, unsigned D>
 class Intersection: public CompositeShape<T, D, IntersectionOps<T, D> >
 {
 private:
-	Intersection() { }
+	Intersection() = default;
 public:
 	Intersection(const Shape<T, D> &, const Shape<T, D> &);
 
diff --git a/source/geometry/loader.h b/source/geometry/loader.h
index 0a9c4b5..58ca8a0 100644
--- a/source/geometry/loader.h
+++ b/source/geometry/loader.h
@@ -20,7 +20,7 @@ template<typename T, unsigned D>
 class DimensionIndependentLoader: public DataFile::Loader
 {
 protected:
-	bool single;
+	bool single = true;
 	std::list<Shape<T, D> *> shapes;
 
 	DimensionIndependentLoader(bool = true);
diff --git a/source/geometry/negation.h b/source/geometry/negation.h
index 60b92e3..c2f96e9 100644
--- a/source/geometry/negation.h
+++ b/source/geometry/negation.h
@@ -14,7 +14,7 @@ template<typename T, unsigned D>
 class Negation: public Shape<T, D>
 {
 private:
-	Shape<T, D> *shape;
+	Shape<T, D> *shape = 0;
 
 public:
 	Negation(const Shape<T, D> &);
diff --git a/source/geometry/quaternion.h b/source/geometry/quaternion.h
index 7c03612..8092597 100644
--- a/source/geometry/quaternion.h
+++ b/source/geometry/quaternion.h
@@ -12,9 +12,12 @@ namespace Geometry {
 template<typename T>
 struct Quaternion
 {
-	T a, b, c, d;
+	T a = T(0);
+	T b = T(0);
+	T c = T(0);
+	T d = T(0);
 
-	Quaternion(): a(0), b(0), c(0), d(0) { }
+	Quaternion() = default;
 	Quaternion(T a_, T b_, T c_, T d_): a(a_), b(b_), c(c_), d(d_) { }
 
 	static Quaternion one() { return Quaternion(1, 0, 0, 0); }
diff --git a/source/geometry/ray.h b/source/geometry/ray.h
index d8eb7d8..efe47fe 100644
--- a/source/geometry/ray.h
+++ b/source/geometry/ray.h
@@ -16,7 +16,7 @@ class Ray
 private:
 	LinAl::Vector<T, D> start;
 	LinAl::Vector<T, D> direction;
-	T limit;
+	T limit = T(0);
 
 public:
 	Ray();
@@ -30,8 +30,7 @@ public:
 };
 
 template<typename T, unsigned D>
-inline Ray<T, D>::Ray():
-	limit(0)
+inline Ray<T, D>::Ray()
 {
 	direction[0] = T(1);
 }
@@ -39,8 +38,7 @@ inline Ray<T, D>::Ray():
 template<typename T, unsigned D>
 inline Ray<T, D>::Ray(const LinAl::Vector<T, D> &s, const LinAl::Vector<T, D> &d):
 	start(s),
-	direction(normalize(d)),
-	limit(0)
+	direction(normalize(d))
 { }
 
 template<typename T, unsigned D>
diff --git a/source/geometry/rectangle.h b/source/geometry/rectangle.h
index cbf625c..273becb 100644
--- a/source/geometry/rectangle.h
+++ b/source/geometry/rectangle.h
@@ -15,7 +15,7 @@ template<typename T>
 class Rectangle: public HyperBox<T, 2>
 {
 public:
-	Rectangle() { }
+	Rectangle() = default;
 	explicit Rectangle(const LinAl::Vector<T, 2> &d): HyperBox<T, 2>(d) { }
 	Rectangle(T w, T h): HyperBox<T, 2>(LinAl::Vector<T, 2>(w, h)) { }
 
diff --git a/source/geometry/shape.h b/source/geometry/shape.h
index 920e456..543550d 100644
--- a/source/geometry/shape.h
+++ b/source/geometry/shape.h
@@ -35,9 +35,9 @@ protected:
 		Coverage coverage;
 	};
 
-	Shape() { }
+	Shape() = default;
 public:
-	virtual ~Shape() { }
+	virtual ~Shape() = default;
 
 	virtual Shape *clone() const = 0;
 
diff --git a/source/geometry/surfacepoint.h b/source/geometry/surfacepoint.h
index 3b38e1d..e5faed1 100644
--- a/source/geometry/surfacepoint.h
+++ b/source/geometry/surfacepoint.h
@@ -15,8 +15,8 @@ struct SurfacePoint
 {
 	LinAl::Vector<T, N> position;
 	LinAl::Vector<T, N> normal;
-	T distance;
-	bool entry;
+	T distance = T(0);
+	bool entry = true;
 };
 
 template<typename T, unsigned N>
diff --git a/source/geometry/transformedshape.h b/source/geometry/transformedshape.h
index 168fbd9..b53f5b8 100644
--- a/source/geometry/transformedshape.h
+++ b/source/geometry/transformedshape.h
@@ -14,7 +14,7 @@ template<typename T, unsigned D>
 class TransformedShape: public Shape<T, D>
 {
 private:
-	Shape<T, D> *shape;
+	Shape<T, D> *shape = 0;
 	AffineTransform<T, D> transformation;
 	AffineTransform<T, D> inverse_trans;
 
diff --git a/source/geometry/union.h b/source/geometry/union.h
index 8c02f2b..0a2de4f 100644
--- a/source/geometry/union.h
+++ b/source/geometry/union.h
@@ -21,7 +21,7 @@ template<typename T, unsigned D>
 class Union: public CompositeShape<T, D, UnionOps<T, D> >
 {
 private:
-	Union() { }
+	Union() = default;
 public:
 	Union(const Shape<T, D> &, const Shape<T, D> &);
 
diff --git a/source/interpolate/polynomial.h b/source/interpolate/polynomial.h
index 859eea8..e076204 100644
--- a/source/interpolate/polynomial.h
+++ b/source/interpolate/polynomial.h
@@ -18,7 +18,7 @@ private:
 	LinAl::Vector<T, D+1> coeff;
 
 public:
-	Polynomial() { }
+	Polynomial() = default;
 	Polynomial(const LinAl::Vector<T, D+1> &c): coeff(c) { }
 	template<typename U, unsigned G>
 	Polynomial(const Polynomial<U, G> &);
diff --git a/source/interpolate/spline.h b/source/interpolate/spline.h
index bd606d9..7c5e032 100644
--- a/source/interpolate/spline.h
+++ b/source/interpolate/spline.h
@@ -63,12 +63,12 @@ public:
 private:
 	enum { STRIDE = sizeof(Segment)-sizeof(Knot) };
 
-	unsigned short n_segments;
-	unsigned short capacity;
-	char *segments;
+	unsigned short n_segments = 0;
+	unsigned short capacity = 0;
+	char *segments = 0;
 
 public:
-	Spline();
+	Spline() = default;
 protected:
 	Spline(const Knot &);
 public:
@@ -92,27 +92,15 @@ public:
 	Value operator()(T) const;
 };
 
-template<typename T, unsigned D, unsigned N>
-inline Spline<T, D, N>::Spline():
-	n_segments(0),
-	capacity(0),
-	segments(0)
-{ }
-
 template<typename T, unsigned D, unsigned N>
 inline Spline<T, D, N>::Spline(const Knot &k):
-	n_segments(0),
-	capacity(0),
 	segments(new char[sizeof(Knot)])
 {
 	new(segments) Knot(k);
 }
 
 template<typename T, unsigned D, unsigned N>
-inline Spline<T, D, N>::Spline(const Spline &s):
-	n_segments(0),
-	capacity(0),
-	segments(0)
+inline Spline<T, D, N>::Spline(const Spline &s)
 {
 	*this = s;
 }
diff --git a/source/linal/dynamicmatrix.h b/source/linal/dynamicmatrix.h
index de4511c..74c9361 100644
--- a/source/linal/dynamicmatrix.h
+++ b/source/linal/dynamicmatrix.h
@@ -21,9 +21,9 @@ public:
 	typedef T ElementType;
 
 private:
-	unsigned rows_;
-	unsigned columns_;
-	T *data;
+	unsigned rows_ = 0;
+	unsigned columns_ = 0;
+	T *data = 0;
 
 public:
 	DynamicMatrix(unsigned, unsigned);
diff --git a/source/linal/dynamicvector.h b/source/linal/dynamicvector.h
index a5379d8..7016a74 100644
--- a/source/linal/dynamicvector.h
+++ b/source/linal/dynamicvector.h
@@ -29,8 +29,8 @@ public:
 	typedef T ElementType;
 
 private:
-	unsigned size_;
-	T *data;
+	unsigned size_ = 0;
+	T *data = 0;
 
 public:
 	DynamicVector(unsigned);
diff --git a/source/linal/vector.h b/source/linal/vector.h
index 610ac21..1587411 100644
--- a/source/linal/vector.h
+++ b/source/linal/vector.h
@@ -19,7 +19,7 @@ private:
 	T data[N];
 
 protected:
-	VectorComponents() { }
+	VectorComponents() = default;
 
 public:
 	T &operator[](unsigned i) { return data[i]; }
@@ -33,7 +33,7 @@ public:
 	T x, y;
 
 protected:
-	VectorComponents() { }
+	VectorComponents() = default;
 
 public:
 	T &operator[](unsigned i) { return *(&x+i); }
@@ -47,7 +47,7 @@ public:
 	T x, y, z;
 
 protected:
-	VectorComponents() { }
+	VectorComponents() = default;
 
 public:
 	T &operator[](unsigned i) { return *(&x+i); }
@@ -61,7 +61,7 @@ public:
 	T x, y, z, w;
 
 protected:
-	VectorComponents() { }
+	VectorComponents() = default;
 
 public:
 	T &operator[](unsigned i) { return *(&x+i); }
-- 
2.45.2