From 2b3bddb02d3aa01e50a1968a6ce58766e069d4c9 Mon Sep 17 00:00:00 2001
From: Bernd Amend <bernd.amend@gmail.com>
Date: Sat, 22 May 2021 14:04:04 +0200
Subject: [PATCH] replace typedef with using

---
 include/chaiscript/dispatchkit/callable_traits.hpp   | 12 ++++++------
 include/chaiscript/dispatchkit/type_info.hpp         |  2 --
 include/chaiscript/language/chaiscript_engine.hpp    |  2 +-
 include/chaiscript/language/chaiscript_optimizer.hpp |  4 ++--
 include/chaiscript/language/chaiscript_tracer.hpp    |  2 +-
 include/chaiscript/language/chaiscript_windows.hpp   |  2 +-
 unittests/compiled_tests.cpp                         |  2 +-
 7 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/include/chaiscript/dispatchkit/callable_traits.hpp b/include/chaiscript/dispatchkit/callable_traits.hpp
index 30d0f532..442dabd6 100644
--- a/include/chaiscript/dispatchkit/callable_traits.hpp
+++ b/include/chaiscript/dispatchkit/callable_traits.hpp
@@ -81,23 +81,23 @@ namespace chaiscript {
       template<typename Ret, typename ... Params>
       struct Function_Signature<Ret (Params...)>
         {
-          typedef Ret Return_Type;
-          typedef Ret (Signature)(Params...);
+          using Return_Type = Ret;
+          using Signature = Ret ()(Params...);
         };
 
       template<typename Ret, typename T, typename ... Params>
       struct Function_Signature<Ret (T::*)(Params...) const>
         {
-          typedef Ret Return_Type;
-          typedef Ret (Signature)(Params...);
+          using Return_Type = Ret;
+          using Signature = Ret ()(Params...);
         };
 
 
       template<typename T>
         struct Callable_Traits
         {
-          typedef typename Function_Signature<decltype(&T::operator())>::Signature Signature;
-          typedef typename Function_Signature<decltype(&T::operator())>::Return_Type Return_Type;
+          using Signature = typename Function_Signature<decltype(&T::operator())>::Signature;
+          using Return_Type = typename Function_Signature<decltype(&T::operator())>::Return_Type;
         };
     }
   }
diff --git a/include/chaiscript/dispatchkit/type_info.hpp b/include/chaiscript/dispatchkit/type_info.hpp
index a8c00d03..7479d9fa 100644
--- a/include/chaiscript/dispatchkit/type_info.hpp
+++ b/include/chaiscript/dispatchkit/type_info.hpp
@@ -150,8 +150,6 @@ namespace chaiscript
     template<typename T>
       struct Get_Type_Info<std::shared_ptr<T> >
       {
-//        typedef T type;
-
         constexpr static Type_Info get() noexcept
         {
           return Type_Info(std::is_const<T>::value, std::is_reference<T>::value, std::is_pointer<T>::value, 
diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp
index 702d5cbc..f584a975 100644
--- a/include/chaiscript/language/chaiscript_engine.hpp
+++ b/include/chaiscript/language/chaiscript_engine.hpp
@@ -60,7 +60,7 @@ namespace chaiscript
 
   namespace detail
   {
-    typedef std::shared_ptr<Loadable_Module> Loadable_Module_Ptr;
+    using Loadable_Module_Ptr = std::shared_ptr<Loadable_Module>;
   }
 
 
diff --git a/include/chaiscript/language/chaiscript_optimizer.hpp b/include/chaiscript/language/chaiscript_optimizer.hpp
index 04ae9725..d44d2cb6 100644
--- a/include/chaiscript/language/chaiscript_optimizer.hpp
+++ b/include/chaiscript/language/chaiscript_optimizer.hpp
@@ -461,8 +461,8 @@ namespace chaiscript {
       }
     };
 
-    typedef Optimizer<optimizer::Partial_Fold, optimizer::Unused_Return, optimizer::Constant_Fold, 
-      optimizer::If, optimizer::Return, optimizer::Dead_Code, optimizer::Block, optimizer::For_Loop, optimizer::Assign_Decl> Optimizer_Default; 
+    using Optimizer_Default = Optimizer<optimizer::Partial_Fold, optimizer::Unused_Return, optimizer::Constant_Fold, 
+      optimizer::If, optimizer::Return, optimizer::Dead_Code, optimizer::Block, optimizer::For_Loop, optimizer::Assign_Decl>; 
 
   }
 }
diff --git a/include/chaiscript/language/chaiscript_tracer.hpp b/include/chaiscript/language/chaiscript_tracer.hpp
index 95fd386c..331c5e5e 100644
--- a/include/chaiscript/language/chaiscript_tracer.hpp
+++ b/include/chaiscript/language/chaiscript_tracer.hpp
@@ -37,7 +37,7 @@ namespace chaiscript {
       }
     };
 
-    typedef Tracer<Noop_Tracer_Detail> Noop_Tracer;
+    using Noop_Tracer = Tracer<Noop_Tracer_Detail>;
 
   }
 }
diff --git a/include/chaiscript/language/chaiscript_windows.hpp b/include/chaiscript/language/chaiscript_windows.hpp
index 46443232..b5f1639b 100644
--- a/include/chaiscript/language/chaiscript_windows.hpp
+++ b/include/chaiscript/language/chaiscript_windows.hpp
@@ -52,7 +52,7 @@ namespace chaiscript
 
       static std::string get_error_message(DWORD t_err)
       {
-        typedef LPTSTR StringType;
+        using StringType = LPTSTR;
 
 #if defined(_UNICODE) || defined(UNICODE)
         std::wstring retval = L"Unknown Error";
diff --git a/unittests/compiled_tests.cpp b/unittests/compiled_tests.cpp
index ddb17365..32e4a96b 100644
--- a/unittests/compiled_tests.cpp
+++ b/unittests/compiled_tests.cpp
@@ -1073,7 +1073,7 @@ struct Count_Tracer
 
 TEST_CASE("Test count tracer")
 {
-  typedef chaiscript::parser::ChaiScript_Parser< chaiscript::eval::Tracer<Count_Tracer>, chaiscript::optimizer::Optimizer_Default >  Parser_Type;
+  using Parser_Type = chaiscript::parser::ChaiScript_Parser< chaiscript::eval::Tracer<Count_Tracer>, chaiscript::optimizer::Optimizer_Default >;
 
   chaiscript::ChaiScript_Basic chai(chaiscript::Std_Lib::library(),
       std::make_unique<Parser_Type>());