Change typedef declarations to modern using aliases (#1217)

Author: leekillough

src/sst/core/clock.h

@@ -102,8 +102,8 @@ class Clock : public Action
     std::string toString() const override;
 
 private:
-    /*     typedef std::list<Clock::HandlerBase*> HandlerMap_t; */
-    typedef std::vector<Clock::HandlerBase*> StaticHandlerMap_t;
+    /* using HandlerMap_t = std::list<Clock::HandlerBase*>; */
+    using StaticHandlerMap_t = std::vector<Clock::HandlerBase*>;
 
     Clock() {}
 

src/sst/core/componentInfo.h

@@ -42,7 +42,7 @@ class ComponentInfo
 {
 
 public:
-    typedef std::vector<ConfigStatistic> statEnableList_t; /*!< List of Enabled Statistics */
+    using statEnableList_t = std::vector<ConfigStatistic>; /*!< List of Enabled Statistics */
 
     // Share Flags for SubComponent loading
     static const uint64_t SHARE_PORTS  = 0x1;
@@ -285,8 +285,8 @@ class ComponentInfoMap
     std::unordered_set<ComponentInfo*, ComponentInfo::HashID, ComponentInfo::EqualsID> dataByID;
 
 public:
-    typedef std::unordered_set<ComponentInfo*, ComponentInfo::HashID, ComponentInfo::EqualsID>::const_iterator
-        const_iterator;
+    using const_iterator =
+        std::unordered_set<ComponentInfo*, ComponentInfo::HashID, ComponentInfo::EqualsID>::const_iterator;
 
     const_iterator begin() const { return dataByID.begin(); }
 

src/sst/core/configGraph.h

@@ -38,8 +38,8 @@ class Config;
 class TimeLord;
 class ConfigGraph;
 
-typedef SparseVectorMap<ComponentId_t> ComponentIdMap_t;
-typedef std::vector<LinkId_t>          LinkIdMap_t;
+using ComponentIdMap_t = SparseVectorMap<ComponentId_t>;
+using LinkIdMap_t      = std::vector<LinkId_t>;
 
 /** Represents the configuration of a generic Link */
 class ConfigLink : public SST::Core::Serialization::serializable
@@ -213,7 +213,7 @@ class ConfigStatOutput : public SST::Core::Serialization::serializable
     ImplementSerializable(SST::ConfigStatOutput)
 };
 
-typedef SparseVectorMap<LinkId_t, ConfigLink*> ConfigLinkMap_t;
+using ConfigLinkMap_t = SparseVectorMap<LinkId_t, ConfigLink*>;
 
 /**
    Class that represents a PortModule in ConfigGraph
@@ -396,16 +396,16 @@ class ConfigComponent : public SST::Core::Serialization::serializable
 };
 
 /** Map names to Links */
-// typedef std::map<std::string,ConfigLink> ConfigLinkMap_t;
-// typedef SparseVectorMap<std::string,ConfigLink> ConfigLinkMap_t;
+// using ConfigLinkMap_t = std::map<std::string,ConfigLink>;
+// using ConfigLinkMap_t = SparseVectorMap<std::string,ConfigLink>;
 /** Map IDs to Components */
-typedef SparseVectorMap<ComponentId_t, ConfigComponent*> ConfigComponentMap_t;
+using ConfigComponentMap_t     = SparseVectorMap<ComponentId_t, ConfigComponent*>;
 /** Map names to Components */
-typedef std::map<std::string, ComponentId_t>             ConfigComponentNameMap_t;
+using ConfigComponentNameMap_t = std::map<std::string, ComponentId_t>;
 /** Map names to Parameter Sets: XML only */
-typedef std::map<std::string, Params*>                   ParamsMap_t;
+using ParamsMap_t              = std::map<std::string, Params*>;
 /** Map names to variable values:  XML only */
-typedef std::map<std::string, std::string>               VariableMap_t;
+using VariableMap_t            = std::map<std::string, std::string>;
 
 class PartitionGraph;
 
@@ -645,8 +645,8 @@ class PartitionLink
     }
 };
 
-typedef SparseVectorMap<ComponentId_t, PartitionComponent*> PartitionComponentMap_t;
-typedef SparseVectorMap<LinkId_t, PartitionLink>            PartitionLinkMap_t;
+using PartitionComponentMap_t = SparseVectorMap<ComponentId_t, PartitionComponent*>;
+using PartitionLinkMap_t      = SparseVectorMap<LinkId_t, PartitionLink>;
 
 class PartitionGraph
 {

src/sst/core/eli/elementbuilder.h

@@ -21,7 +21,7 @@ namespace SST::ELI {
 template <class Base, class... Args>
 struct Builder
 {
-    typedef Base* (*createFxn)(Args...);
+    using createFxn = Base* (*)(Args...);
 
     virtual Base* create(Args... ctorArgs) = 0;
 

src/sst/core/eli/simpleInfo.h

@@ -38,10 +38,10 @@ class checkForELI_getSimpleInfoFunction
     template <typename F, F>
     struct check;
 
-    typedef char Match;
-    typedef long NotMatch;
+    using Match    = char;
+    using NotMatch = long;
 
-    typedef const InfoType& (*functionsig)(SimpleInfoPlaceHolder<index, InfoType>);
+    using functionsig = const InfoType& (*)(SimpleInfoPlaceHolder<index, InfoType>);
 
     template <typename F>
     static Match HasFunction(check<functionsig, &F::ELI_getSimpleInfo>*);

src/sst/core/event.h

@@ -67,9 +67,9 @@ class Event : public Activity
     using Handler2 = SSTHandler2<void, Event*, classT, dataT, funcT>;
 
     /** Type definition of unique identifiers */
-    typedef std::pair<uint64_t, int> id_type;
+    using id_type = std::pair<uint64_t, int>;
     /** Constant, default value for id_types */
-    static const id_type             NO_ID;
+    static const id_type NO_ID;
 
     Event() : Activity(), delivery_info(0)
     {

src/sst/core/impl/timevortex/timeVortexBinnedMap.h

@@ -150,7 +150,7 @@ class TimeVortexBinnedMapBase : public TimeVortex
     // for concurrent access.
     TimeUnit* current_time_unit;
 
-    typedef std::map<SimTime_t, TimeUnit*> mapType_t;
+    using mapType_t = std::map<SimTime_t, TimeUnit*>;
 
     // Accessed by multiple threads, must be locked when accessing
     mapType_t                                               map;

src/sst/core/impl/timevortex/timeVortexPQ.h

@@ -59,7 +59,7 @@ class TimeVortexPQBase : public TimeVortex
     virtual void fixup_handlers() override;
 
 private:
-    typedef std::priority_queue<Activity*, std::vector<Activity*>, Activity::greater<true, true, true>> dataType_t;
+    using dataType_t = std::priority_queue<Activity*, std::vector<Activity*>, Activity::greater<true, true, true>>;
 
     template <class T, class S, class C>
     S& getContainer(std::priority_queue<T, S, C>& q)

src/sst/core/interfaces/simpleNetwork.h

@@ -38,10 +38,10 @@ namespace SST::Interfaces {
 class SimpleNetwork : public SubComponent
 {
 public:
-    SST_ELI_REGISTER_SUBCOMPONENT_API(SST::Interfaces::SimpleNetwork,int)
+    SST_ELI_REGISTER_SUBCOMPONENT_API(SST::Interfaces::SimpleNetwork, int)
 
     /** All Addresses can be 64-bit */
-    typedef int64_t nid_t;
+    using nid_t = int64_t;
 #define PRI_NID PRIi64
 
     static const nid_t INIT_BROADCAST_ADDR;
@@ -96,11 +96,11 @@ class SimpleNetwork : public SubComponent
         /**
          * Trace types
          */
-        typedef enum {
+        enum TraceType {
             NONE,  /*!< No tracing enabled */
             ROUTE, /*!< Trace route information only */
             FULL   /*!< Trace all movements of packets through network */
-        } TraceType;
+        };
 
         /** Constructor */
         Request() :

src/sst/core/interfaces/stdMem.h

@@ -103,7 +103,7 @@ class StandardMem : public SubComponent
     SST_ELI_REGISTER_SUBCOMPONENT_API(SST::Interfaces::StandardMem,TimeConverter*,HandlerBase*)
 
     /** All Addresses can be 64-bit */
-    typedef uint64_t Addr;
+    using Addr = uint64_t;
 #define PRI_ADDR PRIx64
 
     /**
@@ -112,8 +112,8 @@ class StandardMem : public SubComponent
     class Request
     {
     public:
-        typedef uint64_t id_t;
-        typedef uint32_t flags_t;
+        using id_t    = uint64_t;
+        using flags_t = uint32_t;
 
         /** Flags that modify requests.
          * Each bit in a 32-bit field (flags_t) defines a seperate flag.