Clean up UNUSED() macro

src/sst/core/eli/categoryInfo.h

@@ -42,7 +42,7 @@ class ProvidesCategory
         }
     }
 
-    void toString(std::ostream& UNUSED(os)) const { os << "      Category: " << categoryName(cat_) << "\n"; }
+    void toString(std::ostream& os) const { os << "      Category: " << categoryName(cat_) << "\n"; }
 
     template <class XMLNode>
     void outputXML(XMLNode* UNUSED(node))

src/sst/core/impl/interactive/simpleDebug.h

@@ -63,8 +63,8 @@ class SimpleDebugger : public SST::InteractiveConsole
 
     std::vector<std::string> tokenize(std::vector<std::string>& tokens, const std::string& input);
 
-    void cmd_pwd(std::vector<std::string>& UNUSED(tokens));
-    void cmd_ls(std::vector<std::string>& UNUSED(tokens));
+    void cmd_pwd(std::vector<std::string>& tokens);
+    void cmd_ls(std::vector<std::string>& tokens);
     void cmd_cd(std::vector<std::string>& tokens);
     void cmd_print(std::vector<std::string>& tokens);
     void cmd_set(std::vector<std::string>& tokens);

src/sst/core/interfaces/stdMem.h

@@ -1147,7 +1147,7 @@ class StandardMem : public SubComponent
         virtual std::string getString()      = 0; /* String representation for debug/output/etc. */
 
         /* This needs to be serializable so that we can use it in events in parallel simulations */
-        virtual void serialize_order(SST::Core::Serialization::serializer& UNUSED(ser)) override = 0;
+        virtual void serialize_order(SST::Core::Serialization::serializer& ser) override = 0;
         // ImplementSerializable(SST::Interfaces::StandardMem::CustomData);
         ImplementVirtualSerializable(CustomData);
     };

src/sst/core/profile/eventHandlerProfileTool.h

@@ -95,7 +95,7 @@ class EventHandlerProfileToolCount : public EventHandlerProfileTool
     uintptr_t registerLinkAttachTool(const AttachPointMetaData& mdata) override;
 
     void beforeHandler(uintptr_t key, const SST::Event* event) override;
-    void eventSent(uintptr_t UNUSED(key), Event*& UNUSED(ev)) override;
+    void eventSent(uintptr_t key, Event*& ev) override;
 
     void outputData(FILE* fp) override;
 

src/sst/core/shared/sharedObject.h

@@ -54,7 +54,7 @@ class SharedObjectChangeSet : public SST::Core::Serialization::serializable
        @param manager The SharedObjectDataManager for the rank.  This
        is used to get the named shared data.
      */
-    virtual void applyChanges(SharedObjectDataManager* UNUSED(manager)) = 0;
+    virtual void applyChanges(SharedObjectDataManager* manager) = 0;
 
     /**
        Clears the data.  Used after transfering data to other ranks to

src/sst/core/sstinfo.h

@@ -124,13 +124,13 @@ class SSTInfoConfig : public ConfigShared
         return 0;
     }
 
-    int setXMLOutput(const std::string& UNUSED(arg))
+    int setXMLOutput(const std::string& arg)
     {
         m_XMLFilePath = arg;
         return 0;
     }
 
-    int setLibs(const std::string& UNUSED(arg))
+    int setLibs(const std::string& arg)
     {
         addFilter(arg);
         return 0;

src/sst/core/warnmacros.h

@@ -14,7 +14,7 @@
 #ifndef SST_CORE_WARNMACROS_H
 #define SST_CORE_WARNMACROS_H
 
-#define UNUSED(x) x __attribute__((unused))
+#define UNUSED(x) x [[maybe_unused]]
 
 #define DIAG_STR(s)              #s
 #define DIAG_JOINSTR(x, y)       DIAG_STR(x##y)