From 9bc63fa5a943253363091349cc9d04209ccff601 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <varagrawal@gmail.com>
Date: Tue, 1 Dec 2020 17:46:03 -0500
Subject: [PATCH] replace typedef with using

---
 gtsam/geometry/Cal3.h          | 4 ++--
 gtsam/geometry/Cal3Fisheye.h   | 4 ++--
 gtsam/geometry/Cal3Unified.h   | 4 ++--
 gtsam/geometry/Cal3_S2.h       | 5 +++--
 gtsam/geometry/Cal3_S2Stereo.h | 9 +++++----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gtsam/geometry/Cal3.h b/gtsam/geometry/Cal3.h
index 7384fe958..5ce7be8ca 100644
--- a/gtsam/geometry/Cal3.h
+++ b/gtsam/geometry/Cal3.h
@@ -72,8 +72,8 @@ class GTSAM_EXPORT Cal3 {
 
  public:
   enum { dimension = 5 };
-  typedef boost::shared_ptr<Cal3>
-      shared_ptr;  ///< shared pointer to calibration object
+  ///< shared pointer to calibration object
+  using shared_ptr = boost::shared_ptr<Cal3>;
 
   /// @name Standard Constructors
   /// @{
diff --git a/gtsam/geometry/Cal3Fisheye.h b/gtsam/geometry/Cal3Fisheye.h
index 0d8921bd9..3eaf9f46d 100644
--- a/gtsam/geometry/Cal3Fisheye.h
+++ b/gtsam/geometry/Cal3Fisheye.h
@@ -53,8 +53,8 @@ class GTSAM_EXPORT Cal3Fisheye : public Cal3 {
 
  public:
   enum { dimension = 9 };
-  typedef boost::shared_ptr<Cal3Fisheye>
-      shared_ptr;  ///< shared pointer to fisheye calibration object
+  ///< shared pointer to fisheye calibration object
+  using shared_ptr = boost::shared_ptr<Cal3Fisheye>;
 
   /// @name Standard Constructors
   /// @{
diff --git a/gtsam/geometry/Cal3Unified.h b/gtsam/geometry/Cal3Unified.h
index 7a0931ff5..673d9e2c9 100644
--- a/gtsam/geometry/Cal3Unified.h
+++ b/gtsam/geometry/Cal3Unified.h
@@ -42,8 +42,8 @@ namespace gtsam {
  */
 class GTSAM_EXPORT Cal3Unified : public Cal3DS2_Base {
 
-  typedef Cal3Unified This;
-  typedef Cal3DS2_Base Base;
+  using This = Cal3Unified;
+  using Base = Cal3DS2_Base;
 
 private:
 
diff --git a/gtsam/geometry/Cal3_S2.h b/gtsam/geometry/Cal3_S2.h
index aef27323e..0a6b0e164 100644
--- a/gtsam/geometry/Cal3_S2.h
+++ b/gtsam/geometry/Cal3_S2.h
@@ -34,8 +34,9 @@ namespace gtsam {
 class GTSAM_EXPORT Cal3_S2 : public Cal3 {
  public:
   enum { dimension = 5 };
-  typedef boost::shared_ptr<Cal3_S2>
-      shared_ptr;  ///< shared pointer to calibration object
+
+  ///< shared pointer to calibration object
+  using shared_ptr = boost::shared_ptr<Cal3_S2>;
 
   /// @name Standard Constructors
   /// @{
diff --git a/gtsam/geometry/Cal3_S2Stereo.h b/gtsam/geometry/Cal3_S2Stereo.h
index 258cd0434..585807543 100644
--- a/gtsam/geometry/Cal3_S2Stereo.h
+++ b/gtsam/geometry/Cal3_S2Stereo.h
@@ -28,14 +28,15 @@ namespace gtsam {
    * \nosubgrouping
    */
   class GTSAM_EXPORT Cal3_S2Stereo : public Cal3_S2 {
-  private:
+   private:
     double b_;
 
-  public:
+   public:
 
     enum { dimension = 6 };
+
     ///< shared pointer to stereo calibration object
-    typedef boost::shared_ptr<Cal3_S2Stereo> shared_ptr;
+    using shared_ptr = boost::shared_ptr<Cal3_S2Stereo>;
 
     /// @name Standard Constructors
     /// @
@@ -111,7 +112,7 @@ namespace gtsam {
     /// @name Advanced Interface
     /// @{
 
-  private:
+   private:
     /** Serialization function */
     friend class boost::serialization::access;
     template<class Archive>