treewide: remove 'using namespace' from headers
Using namespace at global scope in a header file violates the cpp core
guidelines. Quoting the guidelines:
"Doing so takes away an #includer’s ability to effectively
disambiguate and to use alternatives. It also makes #included headers
order-dependent as they might have different meaning when included in
different orders."
For further reading:
https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rs-using-directive
The guidelines don't call out using using namespace from namespace
scope, but it is only marginally less problematic and still unexpected,
so this patch removes those as well.
The process used to do the update is roughly:
1 - git grep 'using namespace' **.hpp
2 - For each instance, remove the offending 'using namespace' line
3 - build
4 - add 'using namespace' to cpp files or fully resolve types in hpp
files until the project builds again.
Further cleanup is possible - for example cpp files could be scrubbed
for unnecessary namespace qualification - this was not done here to make
review as simple as possible.
Change-Id: I4931f5e78a1b5b74b4a4774c035a549f4d59b91a
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/pldmtool/oem/ibm/oem_ibm_state_set.hpp b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
index a804ba1..74fe895 100644
--- a/pldmtool/oem/ibm/oem_ibm_state_set.hpp
+++ b/pldmtool/oem/ibm/oem_ibm_state_set.hpp
@@ -1,7 +1,5 @@
#include "oem/ibm/libpldmresponder/oem_ibm_handler.hpp"
-using namespace pldm::responder::oem_ibm_platform;
-
/** @brief PLDM OEM State Set range as per DSP0249_1.1.0 specification
*/
enum pldm_oem_state_set_id_codes
@@ -51,7 +49,8 @@
/** @brief Map for PLDM OEM IBM Entity Types
*/
extern const std::map<uint8_t, std::string> OemIBMEntityType{
- {PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE, "OEM IBM Firmware Update"},
+ {pldm::responder::oem_ibm_platform::PLDM_OEM_IBM_ENTITY_FIRMWARE_UPDATE,
+ "OEM IBM Firmware Update"},
{PLDM_OEM_ENTITY_TYPE_START, "OEM IBM Entity Type Start"},
{PLDM_OEM_ENTITY_TYPE_END, "OEM IBM Entity Type End"},
};
@@ -61,7 +60,8 @@
extern const std::map<uint16_t, std::string> OemIBMstateSet{
{PLDM_OEM_IBM_FIRMWARE_UPDATE_STATE, "OEM IBM Firmware Update State"},
{PLDM_OEM_IBM_BOOT_STATE, "OEM IBM Boot State"},
- {PLDM_OEM_IBM_VERIFICATION_STATE, "OEM IBM Verification State"},
+ {pldm::responder::oem_ibm_platform::PLDM_OEM_IBM_VERIFICATION_STATE,
+ "OEM IBM Verification State"},
{PLDM_OEM_IBM_SYSTEM_POWER_STATE, "OEM IBM System Power State"}};
/** @brief Map for PLDM OEM IBM firmware update possible state values
@@ -98,7 +98,8 @@
*/
extern const std::map<uint16_t, const std::map<uint8_t, std::string>>
populateOemIBMStateMaps{
- {PLDM_OEM_IBM_VERIFICATION_STATE, SetOemIBMVerStateValues},
+ {pldm::responder::oem_ibm_platform::PLDM_OEM_IBM_VERIFICATION_STATE,
+ SetOemIBMVerStateValues},
{PLDM_OEM_IBM_SYSTEM_POWER_STATE, SetOemIBMSysPowerStatesValues},
{PLDM_OEM_IBM_BOOT_STATE, SetOemIBMBootStateValues},
{PLDM_OEM_IBM_FIRMWARE_UPDATE_STATE, SetOemIBMFWUpdateStateValues},
diff --git a/pldmtool/pldm_bios_cmd.cpp b/pldmtool/pldm_bios_cmd.cpp
index 45d8f6e..b47a1b5 100644
--- a/pldmtool/pldm_bios_cmd.cpp
+++ b/pldmtool/pldm_bios_cmd.cpp
@@ -21,6 +21,7 @@
using namespace pldmtool::helper;
using namespace pldm::bios::utils;
+using namespace pldm::utils;
std::vector<std::unique_ptr<CommandInterface>> commands;
diff --git a/pldmtool/pldm_cmd_helper.cpp b/pldmtool/pldm_cmd_helper.cpp
index 10e051f..0bb2941 100644
--- a/pldmtool/pldm_cmd_helper.cpp
+++ b/pldmtool/pldm_cmd_helper.cpp
@@ -11,6 +11,8 @@
#include <exception>
+using namespace pldm::utils;
+
namespace pldmtool
{
diff --git a/pldmtool/pldm_cmd_helper.hpp b/pldmtool/pldm_cmd_helper.hpp
index bd890d9..51dcd12 100644
--- a/pldmtool/pldm_cmd_helper.hpp
+++ b/pldmtool/pldm_cmd_helper.hpp
@@ -26,7 +26,6 @@
namespace helper
{
-using namespace pldm::utils;
constexpr uint8_t PLDM_ENTITY_ID = 8;
constexpr uint8_t MCTP_MSG_TYPE_PLDM = 1;
using ordered_json = nlohmann::ordered_json;
diff --git a/pldmtool/pldm_platform_cmd.cpp b/pldmtool/pldm_platform_cmd.cpp
index ce9c39f..76d8c8b 100644
--- a/pldmtool/pldm_platform_cmd.cpp
+++ b/pldmtool/pldm_platform_cmd.cpp
@@ -8,6 +8,8 @@
#include "oem/ibm/oem_ibm_state_set.hpp"
#endif
+using namespace pldm::utils;
+
namespace pldmtool
{