diff options
| author | Patrick Venture <venture@google.com> | 2019-09-09 14:47:22 -0700 |
|---|---|---|
| committer | Patrick Venture <venture@google.com> | 2019-09-17 01:43:55 +0000 |
| commit | db0cbe643bc8d017afd58903eb4aacd48f94361a (patch) | |
| tree | ea80bdea2f083ebebb64e1f0e3d26164e2a4e2ee /storagehandler.cpp | |
| parent | 235b3c76c354f9242192f56cab609ec9e53c0cc3 (diff) | |
| download | phosphor-host-ipmid-db0cbe643bc8d017afd58903eb4aacd48f94361a.tar.gz phosphor-host-ipmid-db0cbe643bc8d017afd58903eb4aacd48f94361a.zip | |
move sensors into ipmi::sensor namespace
The object was left in the global namespace, but the type was in the
ipmi::sensor namespace. Move the object into the namespace.
Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I88e46da4abda220d3b6fcc2ea64b8ef0decb0dc3
Diffstat (limited to 'storagehandler.cpp')
| -rw-r--r-- | storagehandler.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/storagehandler.cpp b/storagehandler.cpp index 0932f72..96d3d54 100644 --- a/storagehandler.cpp +++ b/storagehandler.cpp @@ -27,7 +27,14 @@ void register_netfn_storage_functions() __attribute__((constructor)); unsigned int g_sel_time = 0xFFFFFFFF; -extern const ipmi::sensor::IdInfoMap sensors; +namespace ipmi +{ +namespace sensor +{ +extern const IdInfoMap sensors; +} // namespace sensor +} // namespace ipmi + extern const FruMap frus; constexpr uint8_t eventDataSize = 3; namespace @@ -725,7 +732,7 @@ ipmi::RspType<uint8_t, // SDR version constexpr uint32_t deletionTimestamp = 0x0; constexpr uint8_t operationSupport = 0; - uint16_t records = frus.size() + sensors.size(); + uint16_t records = frus.size() + ipmi::sensor::sensors.size(); return ipmi::responseSuccess(sdrVersion, records, freeSpace, additionTimestamp, deletionTimestamp, |
