Use C++17 nested namespaces; remove using namespace std

src/sst/core/baseComponent.cc

@@ -919,9 +919,7 @@ BaseComponent::serialize_order(SST::Core::Serialization::serializer& ser)
     }
 }
 
-namespace Core {
-namespace Serialization {
-namespace pvt {
+namespace Core::Serialization::pvt {
 
 static const long null_ptr_id = -1;
 
@@ -997,9 +995,6 @@ SerializeBaseComponentHelper::map_basecomponent(serializable_base*& s, serialize
     ser.mapper().map_hierarchy_end(); // obj_map
 }
 
-} // namespace pvt
-} // namespace Serialization
-} // namespace Core
-
+} // namespace Core::Serialization::pvt
 
 } // namespace SST

src/sst/core/baseComponent.h

@@ -49,13 +49,9 @@ class TimeConverter;
 class UnitAlgebra;
 
 
-namespace Core {
-namespace Serialization {
-namespace pvt {
+namespace Core::Serialization::pvt {
 class SerializeBaseComponentHelper;
-} // namespace pvt
-} // namespace Serialization
-} // namespace Core
+}
 
 /**
  * Main component object for the simulation.
@@ -1117,11 +1113,9 @@ class SubComponentSlotInfo
     }
 };
 
-namespace Core {
-namespace Serialization {
+namespace Core::Serialization {
 
 namespace pvt {
-
 class SerializeBaseComponentHelper
 {
 public:
@@ -1169,8 +1163,7 @@ class serialize_impl<T*, typename std::enable_if<std::is_base_of<SST::BaseCompon
     }
 };
 
-} // namespace Serialization
-} // namespace Core
+} // namespace Core::Serialization
 
 } // namespace SST
 

src/sst/core/cfgoutput/dotConfigOutput.h

@@ -16,8 +16,7 @@
 #include "sst/core/configGraph.h"
 #include "sst/core/configGraphOutput.h"
 
-namespace SST {
-namespace Core {
+namespace SST::Core {
 
 class DotConfigGraphOutput : public ConfigGraphOutput
 {
@@ -33,7 +32,6 @@ class DotConfigGraphOutput : public ConfigGraphOutput
     void generateDot(const ConfigLink* link, const uint32_t dot_verbosity) const;
 };
 
-} // namespace Core
-} // namespace SST
+} // namespace SST::Core
 
 #endif // SST_CORE_DOT_CONFIG_OUTPUT_H

src/sst/core/cfgoutput/jsonConfigOutput.h

@@ -16,8 +16,7 @@
 #include "sst/core/configGraph.h"
 #include "sst/core/configGraphOutput.h"
 
-namespace SST {
-namespace Core {
+namespace SST::Core {
 
 class JSONConfigGraphOutput : public ConfigGraphOutput
 {
@@ -27,7 +26,6 @@ class JSONConfigGraphOutput : public ConfigGraphOutput
     virtual void generate(const Config* cfg, ConfigGraph* graph) override;
 };
 
-} // namespace Core
-} // namespace SST
+} // namespace SST::Core
 
 #endif // SST_CORE_JSON_CONFIG_OUTPUT_H

src/sst/core/cfgoutput/pythonConfigOutput.h

@@ -18,8 +18,7 @@
 
 #include <map>
 
-namespace SST {
-namespace Core {
+namespace SST::Core {
 
 class PythonConfigGraphOutput : public ConfigGraphOutput
 {
@@ -51,7 +50,6 @@ class PythonConfigGraphOutput : public ConfigGraphOutput
     std::map<LinkId_t, std::string> linkMap;
 };
 
-} // namespace Core
-} // namespace SST
+} // namespace SST::Core
 
 #endif // SST_CORE_PYTHON_CONFIG_OUTPUT_H

src/sst/core/cfgoutput/xmlConfigOutput.h

@@ -16,8 +16,7 @@
 #include "sst/core/configGraph.h"
 #include "sst/core/configGraphOutput.h"
 
-namespace SST {
-namespace Core {
+namespace SST::Core {
 
 class XMLConfigGraphOutput : public ConfigGraphOutput
 {
@@ -30,7 +29,6 @@ class XMLConfigGraphOutput : public ConfigGraphOutput
     void generateXML(const std::string& indent, const ConfigLink* link, const ConfigComponentMap_t& compMap) const;
 };
 
-} // namespace Core
-} // namespace SST
+} // namespace SST::Core
 
 #endif // SST_CORE_XML_CONFIG_OUTPUT_H

src/sst/core/componentInfo.h

@@ -34,13 +34,9 @@ class ConfigStatistic;
 class Simulation_impl;
 class TimeConverter;
 
-namespace Core {
-namespace Serialization {
-namespace pvt {
+namespace Core::Serialization::pvt {
 class SerializeBaseComponentHelper;
-} // namespace pvt
-} // namespace Serialization
-} // namespace Core
+} // namespace Core::Serialization::pvt
 
 class ComponentInfo
 {
@@ -52,8 +48,7 @@ class ComponentInfo
     static const uint64_t SHARE_PORTS  = 0x1;
     static const uint64_t SHARE_STATS  = 0x2;
     static const uint64_t INSERT_STATS = 0x4;
-
-    static const uint64_t SHARE_NONE = 0x0;
+    static const uint64_t SHARE_NONE   = 0x0;
 
 private:
     // Mask to make sure users are only setting the flags that are

src/sst/core/config.cc

@@ -25,8 +25,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-using namespace std;
-
 namespace SST {
 
 //// Helper class for setting options
@@ -1197,7 +1195,7 @@ Config::checkArgsAfterParsing()
 
 
 bool
-Config::setOptionFromModel(const string& entryName, const string& value)
+Config::setOptionFromModel(const std::string& entryName, const std::string& value)
 {
     // Check to make sure option is settable in the SDL file
     if ( getAnnotation(entryName, 'S') ) { return setOptionExternal(entryName, value); }

src/sst/core/configBase.cc

@@ -29,8 +29,6 @@
 #define E_OK 0
 #endif
 
-using namespace std;
-
 namespace SST {
 
 bool
@@ -431,7 +429,7 @@ ConfigBase::parseCmdLine(int argc, char* argv[], bool ignore_unknown)
 
 
 bool
-ConfigBase::setOptionExternal(const string& entryName, const string& value)
+ConfigBase::setOptionExternal(const std::string& entryName, const std::string& value)
 {
     // NOTE: print outs in this function will not be suppressed
     for ( auto& option : options ) {

src/sst/core/configGraph.cc

@@ -26,8 +26,6 @@
 #include <fstream>
 #include <string.h>
 
-using namespace std;
-
 namespace {
 // bool zero_latency_warning = false;
 
@@ -931,7 +929,7 @@ ConfigGraph::findStatistic(StatisticId_t id) const
 ConfigGraph*
 ConfigGraph::getSubGraph(uint32_t start_rank, uint32_t end_rank)
 {
-    set<uint32_t> rank_set;
+    std::set<uint32_t> rank_set;
     for ( uint32_t i = start_rank; i <= end_rank; i++ ) {
         rank_set.insert(i);
     }
@@ -1392,7 +1390,7 @@ PartitionComponent::print(std::ostream& os, const PartitionGraph* graph) const
     for ( ComponentIdMap_t::const_iterator git = group.begin(); git != group.end(); ++git ) {
         os << *git << " ";
     }
-    os << ")" << endl;
+    os << ")" << std::endl;
     os << "  weight = " << weight << std::endl;
     os << "  rank = " << rank.rank << std::endl;
     os << "  thread = " << rank.thread << std::endl;

src/sst/core/configShared.cc

@@ -17,8 +17,6 @@
 
 #include <functional>
 
-using namespace std;
-
 namespace SST {
 
 ConfigShared::ConfigShared(bool suppress_print, bool include_libpath, bool include_env, bool include_verbose) :

src/sst/core/eli/attributeInfo.h

@@ -18,8 +18,7 @@
 #include <string>
 #include <vector>
 
-namespace SST {
-namespace ELI {
+namespace SST::ELI {
 
 template <typename, typename = void>
 struct GetAttributes
@@ -70,8 +69,7 @@ class ProvidesAttributes
     std::vector<ElementInfoAttribute> attributes_;
 };
 
-} // namespace ELI
-} // namespace SST
+} // namespace SST::ELI
 
 // clang-format off
 #define SST_ELI_DOCUMENT_ATTRIBUTES(...)                                                                           \

src/sst/core/eli/categoryInfo.h

@@ -19,8 +19,7 @@
 #include <string>
 #include <vector>
 
-namespace SST {
-namespace ELI {
+namespace SST::ELI {
 
 class ProvidesCategory
 {
@@ -61,7 +60,6 @@ class ProvidesCategory
 #define SST_ELI_CATEGORY_INFO(cat) \
     static uint32_t ELI_getCategory() { return cat; }
 
-} // namespace ELI
-} // namespace SST
+} // namespace SST::ELI
 
 #endif

src/sst/core/eli/defaultInfo.h

@@ -17,8 +17,7 @@
 #include <string>
 #include <vector>
 
-namespace SST {
-namespace ELI {
+namespace SST::ELI {
 
 class ProvidesDefaultInfo
 {
@@ -73,8 +72,7 @@ class ProvidesDefaultInfo
     std::string      alias_;
 };
 
-} // namespace ELI
-} // namespace SST
+} // namespace SST::ELI
 
 #define SST_ELI_INSERT_COMPILE_INFO()                     \
     static const std::string& ELI_getCompileDate()        \

src/sst/core/eli/elementbuilder.h

@@ -16,8 +16,7 @@
 
 #include <type_traits>
 
-namespace SST {
-namespace ELI {
+namespace SST::ELI {
 
 template <class Base, class... Args>
 struct Builder
@@ -333,8 +332,7 @@ struct CtorList<Base, void>
     }
 };
 
-} // namespace ELI
-} // namespace SST
+} // namespace SST::ELI
 
 #define ELI_CTOR(...)      std::tuple<__VA_ARGS__>
 #define ELI_DEFAULT_CTOR() std::tuple<>

src/sst/core/eli/elementinfo.cc

@@ -19,12 +19,11 @@
 #include <string>
 #include <vector>
 
-namespace SST {
+namespace SST::ELI {
 
 /**************************************************************************
   BaseElementInfo class functions
 **************************************************************************/
-namespace ELI {
 
 void
 force_instantiate_bool(bool UNUSED(b), const char* UNUSED(name))
@@ -135,5 +134,4 @@ ProvidesParams::init()
     }
 }
 
-} // namespace ELI
-} // namespace SST
+} // namespace SST::ELI

src/sst/core/eli/elibase.cc

@@ -13,12 +13,11 @@
 
 #include "sst/core/eli/elibase.h"
 
-namespace SST {
+namespace SST::ELI {
 
 /**************************************************************************
   BaseElementInfo class functions
 **************************************************************************/
-namespace ELI {
 
 std::unique_ptr<LoadedLibraries::LibraryMap> LoadedLibraries::loaders_ {};
 
@@ -48,5 +47,4 @@ LoadedLibraries::isLoaded(const std::string& name)
     }
 }
 
-} // namespace ELI
-} // namespace SST
+} // namespace SST::ELI

src/sst/core/eli/interfaceInfo.h

@@ -15,8 +15,7 @@
 #include <iostream>
 #include <string>
 
-namespace SST {
-namespace ELI {
+namespace SST::ELI {
 
 class ProvidesInterface
 {
@@ -40,8 +39,7 @@ class ProvidesInterface
     std::string iface_;
 };
 
-} // namespace ELI
-} // namespace SST
+} // namespace SST::ELI
 
 #define SST_ELI_INTERFACE_INFO(interface) \
     static const std::string ELI_getInterface() { return interface; }

src/sst/core/eli/paramsInfo.h

@@ -17,8 +17,7 @@
 #include <string>
 #include <vector>
 
-namespace SST {
-namespace ELI {
+namespace SST::ELI {
 
 template <typename, typename = void>
 struct GetParams
@@ -77,8 +76,7 @@ class ProvidesParams
     std::vector<ElementInfoParam> params_;
 };
 
-} // namespace ELI
-} // namespace SST
+} // namespace SST::ELI
 
 // clang-format off
 #define SST_ELI_DOCUMENT_PARAMS(...)                                                                               \