From 04776d05b0aae7ebca8388ef842a68ef0523b53c Mon Sep 17 00:00:00 2001
From: Knut Morten Okstad <knut.morten.okstad@sintef.no>
Date: Tue, 17 Oct 2023 11:39:59 +0200
Subject: [PATCH] Changed: Put PointValue[s] definition in Vec3.h for reuse
 while replacing typedef with using

---
 src/SIM/SIMoutput.h | 9 ++++-----
 src/Utility/Vec3.h  | 6 ++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/SIM/SIMoutput.h b/src/SIM/SIMoutput.h
index 1751cfb2..3ec7411f 100644
--- a/src/SIM/SIMoutput.h
+++ b/src/SIM/SIMoutput.h
@@ -20,9 +20,6 @@
 class ElementBlock;
 class VTF;
 
-typedef std::pair<Vec3,double>  PointValue;  //!< Convenience type
-typedef std::vector<PointValue> PointValues; //!< Convenience type
-
 
 /*!
   \brief Sub-class with additional functionality for result output.
@@ -335,8 +332,10 @@ protected:
     ResultPoint() : npar(0), patch(1), inod(0) { u[0] = u[1] = u[2] = 0.0; }
   };
 
-  typedef std::vector<ResultPoint> ResPointVec; //!< Result point container
-  typedef std::pair<std::string,ResPointVec> ResPtPair; //!< Result point group
+  //! \brief Result point container.
+  using ResPointVec = std::vector<ResultPoint>;
+  //! \brief File name to result point group mapping.
+  using ResPtPair = std::pair<std::string,ResPointVec>;
 
   //! \brief Preprocesses the result sampling points.
   virtual void preprocessResultPoints();
diff --git a/src/Utility/Vec3.h b/src/Utility/Vec3.h
index ebb53d16..c695caa9 100644
--- a/src/Utility/Vec3.h
+++ b/src/Utility/Vec3.h
@@ -290,7 +290,9 @@ public:
 };
 
 
-typedef std::pair<Vec3,Vec3> Vec3Pair; //!< A pair of two point vectors
-typedef std::vector<Vec3>    Vec3Vec;  //!< An array of point vectors
+using Vec3Pair    = std::pair<Vec3,Vec3>;    //!< A pair of two point vectors
+using PointValue  = std::pair<Vec3,double>;  //!< A point with associated value
+using Vec3Vec     = std::vector<Vec3>;       //!< An array of point vectors
+using PointValues = std::vector<PointValue>; //!< An array of point values
 
 #endif