From 7b46a7ef9e5363912cb612b14ab0d160ed599bce Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 24 Aug 2020 06:55:36 -0400
Subject: [PATCH] Default empty destructors in llmath

---
 indra/llmath/llcamera.cpp       | 5 -----
 indra/llmath/llcamera.h         | 2 +-
 indra/llmath/lltreenode.h       | 2 +-
 indra/llmath/llvolume.cpp       | 9 ---------
 indra/llmath/llvolume.h         | 4 ++--
 indra/llmath/llvolumeoctree.cpp | 7 +------
 indra/llmath/llvolumeoctree.h   | 2 +-
 7 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/indra/llmath/llcamera.cpp b/indra/llmath/llcamera.cpp
index 90341820721..1e2031b430a 100644
--- a/indra/llmath/llcamera.cpp
+++ b/indra/llmath/llcamera.cpp
@@ -70,11 +70,6 @@ LLCamera::LLCamera(F32 vertical_fov_rads, F32 aspect_ratio, S32 view_height_in_p
 	setView(vertical_fov_rads);
 } 
 
-LLCamera::~LLCamera()
-{
-
-}
-
 // ---------------- LLCamera::getFoo() member functions ----------------
 
 F32 LLCamera::getMinView() const 
diff --git a/indra/llmath/llcamera.h b/indra/llmath/llcamera.h
index d0afa0e88f3..a8d13f698ff 100644
--- a/indra/llmath/llcamera.h
+++ b/indra/llmath/llcamera.h
@@ -150,7 +150,7 @@ class LLCamera
 public:
 	LLCamera();
 	LLCamera(F32 vertical_fov_rads, F32 aspect_ratio, S32 view_height_in_pixels, F32 near_plane, F32 far_plane);
-	virtual ~LLCamera();
+	virtual ~LLCamera() = default;
 	
 	bool isChanged(); //check if mAgentPlanes changed since last frame.
 
diff --git a/indra/llmath/lltreenode.h b/indra/llmath/lltreenode.h
index 0b479c4564f..c51c08b8466 100644
--- a/indra/llmath/lltreenode.h
+++ b/indra/llmath/lltreenode.h
@@ -85,7 +85,7 @@ template <class T>
 class LLTreeTraveler
 {
 public:
-	virtual ~LLTreeTraveler() { }; 
+	virtual ~LLTreeTraveler() = default;
 	virtual void traverse(const LLTreeNode<T>* node) = 0;
 	virtual void visit(const LLTreeNode<T>* node) = 0;
 };
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 3f3b8cc132a..185a10088cf 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -1269,10 +1269,6 @@ void LLProfileParams::copyParams(const LLProfileParams &params)
 }
 
 
-LLPath::~LLPath()
-{
-}
-
 S32 LLPath::getNumNGonPoints(const LLPathParams& params, S32 sides, F32 startOff, F32 end_scale, F32 twist_scale)
 { //this is basically LLPath::genNGon stripped down to only operations that influence the number of points added
 	S32 ret = 0;
@@ -2031,11 +2027,6 @@ void LLPathParams::copyParams(const LLPathParams &params)
 	setSkew(params.getSkew());
 }
 
-LLProfile::~LLProfile()
-{
-}
-
-
 S32 LLVolume::sNumMeshPoints = 0;
 
 LLVolume::LLVolume(const LLVolumeParams &params, const F32 detail, const BOOL generate_single_face, const BOOL is_unique)
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index 081fc07a8e5..f389119c47d 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -726,7 +726,7 @@ class LLProfile
 	friend std::ostream& operator<<(std::ostream &s, const LLProfile &profile);
 
 protected:
-	~LLProfile();
+	~LLProfile() = default;
 
 	static S32 getNumNGonPoints(const LLProfileParams& params, S32 sides, F32 offset=0.0f, F32 bevel = 0.0f, F32 ang_scale = 1.f, S32 split = 0);
 	void genNGon(const LLProfileParams& params, S32 sides, F32 offset=0.0f, F32 bevel = 0.0f, F32 ang_scale = 1.f, S32 split = 0);
@@ -785,7 +785,7 @@ class LLPath
 	{
 	}
 
-	virtual ~LLPath();
+	virtual ~LLPath() = default;
 
 	static S32 getNumPoints(const LLPathParams& params, F32 detail);
 	static S32 getNumNGonPoints(const LLPathParams& params, S32 sides, F32 offset=0.0f, F32 end_scale = 1.f, F32 twist_scale = 1.f);
diff --git a/indra/llmath/llvolumeoctree.cpp b/indra/llmath/llvolumeoctree.cpp
index 0c9159ba424..52bbf08b4ba 100644
--- a/indra/llmath/llvolumeoctree.cpp
+++ b/indra/llmath/llvolumeoctree.cpp
@@ -80,12 +80,7 @@ LLVolumeOctreeListener::LLVolumeOctreeListener(LLOctreeNode<LLVolumeTriangle>* n
 	node->addListener(this);
 }
 
-LLVolumeOctreeListener::~LLVolumeOctreeListener()
-{
-
-}
-	
-void LLVolumeOctreeListener::handleChildAddition(const LLOctreeNode<LLVolumeTriangle>* parent, 
+void LLVolumeOctreeListener::handleChildAddition(const LLOctreeNode<LLVolumeTriangle>* parent,
 	LLOctreeNode<LLVolumeTriangle>* child)
 {
 	new LLVolumeOctreeListener(child);
diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h
index 67677103162..934e0e2d041 100644
--- a/indra/llmath/llvolumeoctree.h
+++ b/indra/llmath/llvolumeoctree.h
@@ -90,7 +90,7 @@ class LLVolumeOctreeListener : public LLOctreeListener<LLVolumeTriangle>
 	}
 
 	LLVolumeOctreeListener(LLOctreeNode<LLVolumeTriangle>* node);
-	~LLVolumeOctreeListener();
+	~LLVolumeOctreeListener() = default;
 	
 	LLVolumeOctreeListener(const LLVolumeOctreeListener& rhs) = delete;
     LLVolumeOctreeListener& operator=(const LLVolumeOctreeListener& rhs) = delete;
-- 
GitLab