Merge remote-tracking branch 'sstcore/devel' into combineEliInfo

Author: leekillough

src/sst/core/eli/attributeInfo.h

@@ -21,7 +21,7 @@
 namespace SST {
 namespace ELI {
 
-template <class T, class Enable = void>
+template <typename, typename = void>
 struct GetAttributes
 {
     static const std::vector<SST::ElementInfoAttribute>& get()
@@ -31,8 +31,8 @@ struct GetAttributes
     }
 };
 
-template <class T>
-struct GetAttributes<T, typename MethodDetect<decltype(T::ELI_getAttributes())>::type>
+template <typename T>
+struct GetAttributes<T, std::void_t<decltype(T::ELI_getAttributes())>>
 {
     static const std::vector<SST::ElementInfoAttribute>& get() { return T::ELI_getAttributes(); }
 };

src/sst/core/eli/elementinfo.cc

@@ -15,7 +15,7 @@
 
 #include "sst/core/eli/elibase.h"
 
-#include <sstream>
+#include <ostream>
 #include <string>
 #include <vector>
 
@@ -35,16 +35,14 @@ static const std::vector<int> SST_ELI_COMPILED_VERSION = { 0, 9, 0 };
 std::string
 ProvidesDefaultInfo::getELIVersionString() const
 {
-    std::stringstream stream;
-    bool              first = true;
-    for ( int item : SST_ELI_COMPILED_VERSION ) {
-        if ( first )
-            first = false;
-        else
-            stream << ".";
-        stream << item;
+    std::string str;
+    const char* delim = "";
+    for ( auto item : SST_ELI_COMPILED_VERSION ) {
+        str += delim;
+        delim = ".";
+        str += std::to_string(item);
     }
-    return stream.str();
+    return str;
 }
 
 const std::vector<int>&

src/sst/core/eli/elibase.cc

@@ -22,8 +22,6 @@ namespace ELI {
 
 std::unique_ptr<LoadedLibraries::LibraryMap> LoadedLibraries::loaders_ {};
 
-static const std::vector<int> SST_ELI_COMPILED_VERSION = { 0, 9, 0 };
-
 bool
 LoadedLibraries::addLoader(
     const std::string& lib, const std::string& name, const std::string& alias, LibraryLoader* loader)

src/sst/core/eli/elibase.h

@@ -122,12 +122,6 @@ combineEliInfo(std::vector<T>& base, const std::vector<T>& add)
     base.swap(combined);
 }
 
-template <class T>
-struct MethodDetect
-{
-    using type = void;
-};
-
 struct LibraryLoader
 {
     virtual void load() = 0;
@@ -156,14 +150,14 @@ class LoadedLibraries
 
 // Template used to get aliases.  Needed because the ELI_getAlias()
 // function may not exist.
-template <class T, class Enable = void>
+template <typename, typename = void>
 struct GetAlias
 {
     static std::string get() { return ""; }
 };
 
-template <class T>
-struct GetAlias<T, typename MethodDetect<decltype(T::ELI_getAlias())>::type>
+template <typename T>
+struct GetAlias<T, std::void_t<decltype(T::ELI_getAlias())>>
 {
     static std::string get() { return T::ELI_getAlias(); }
 };

src/sst/core/eli/paramsInfo.h

@@ -20,7 +20,7 @@
 namespace SST {
 namespace ELI {
 
-template <class T, class Enable = void>
+template <typename, typename = void>
 struct GetParams
 {
     static const std::vector<SST::ElementInfoParam>& get()
@@ -31,7 +31,7 @@ struct GetParams
 };
 
 template <class T>
-struct GetParams<T, typename MethodDetect<decltype(T::ELI_getParams())>::type>
+struct GetParams<T, std::void_t<decltype(T::ELI_getParams())>>
 {
     static const std::vector<SST::ElementInfoParam>& get() { return T::ELI_getParams(); }
 };

src/sst/core/eli/portsInfo.h

@@ -20,7 +20,7 @@
 namespace SST {
 namespace ELI {
 
-template <class T, class Enable = void>
+template <typename, typename = void>
 struct InfoPorts
 {
     static const std::vector<SST::ElementInfoPort>& get()
@@ -30,8 +30,8 @@ struct InfoPorts
     }
 };
 
-template <class T>
-struct InfoPorts<T, typename MethodDetect<decltype(T::ELI_getPorts())>::type>
+template <typename T>
+struct InfoPorts<T, std::void_t<decltype(T::ELI_getPorts())>>
 {
     static const std::vector<SST::ElementInfoPort>& get() { return T::ELI_getPorts(); }
 };

src/sst/core/eli/profilePointInfo.h

@@ -20,7 +20,7 @@
 namespace SST {
 namespace ELI {
 
-template <class T, class Enable = void>
+template <typename, typename = void>
 struct InfoProfilePoints
 {
     static const std::vector<SST::ElementInfoProfilePoint>& get()
@@ -31,7 +31,7 @@ struct InfoProfilePoints
 };
 
 template <class T>
-struct InfoProfilePoints<T, typename MethodDetect<decltype(T::ELI_getProfilePoints())>::type>
+struct InfoProfilePoints<T, std::void_t<decltype(T::ELI_getProfilePoints())>>
 {
     static const std::vector<SST::ElementInfoProfilePoint>& get() { return T::ELI_getProfilePoints(); }
 };

src/sst/core/eli/simpleInfo.h

@@ -28,9 +28,9 @@ template <int num, typename InfoType>
 struct SimpleInfoPlaceHolder
 {};
 
-//  Class to check for an ELI_getSimpleInfo Function.  The
-//  MethodDetect way to detect a member function doesn't seem to work
-//  for functions with specific type signatures and we need to
+//  Class to check for an ELI_getSimpleInfo Function. The std::void_t<
+//  decltype()> way to detect a member function's type doesn't seem to
+//  work for functions with specific type signatures and we need to
 //  differentiate between the various versions using the first
 //  parameter to the function (index + type).
 template <class T, int index, class InfoType>

src/sst/core/eli/statsInfo.h

@@ -20,7 +20,7 @@
 namespace SST {
 namespace ELI {
 
-template <class T, class Enable = void>
+template <typename, typename = void>
 struct InfoStats
 {
     static const std::vector<SST::ElementInfoStatistic>& get()
@@ -30,8 +30,8 @@ struct InfoStats
     }
 };
 
-template <class T>
-struct InfoStats<T, typename MethodDetect<decltype(T::ELI_getStatistics())>::type>
+template <typename T>
+struct InfoStats<T, std::void_t<decltype(T::ELI_getStatistics())>>
 {
     static const std::vector<SST::ElementInfoStatistic>& get() { return T::ELI_getStatistics(); }
 };

src/sst/core/eli/subcompSlotInfo.h

@@ -20,7 +20,7 @@
 namespace SST {
 namespace ELI {
 
-template <class T, class Enable = void>
+template <typename, typename = void>
 struct InfoSubs
 {
     static const std::vector<SST::ElementInfoSubComponentSlot>& get()
@@ -31,7 +31,7 @@ struct InfoSubs
 };
 
 template <class T>
-struct InfoSubs<T, typename MethodDetect<decltype(T::ELI_getSubComponentSlots())>::type>
+struct InfoSubs<T, std::void_t<decltype(T::ELI_getSubComponentSlots())>>
 {
     static const std::vector<SST::ElementInfoSubComponentSlot>& get() { return T::ELI_getSubComponentSlots(); }
 };