Moved Callout class logic to Resolution classes
This simplified the confusion between the Callout and Resolution classes
because there was a lot of overlap.
Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: Iea0fb30a1577869ebfe5b2b195fee832a694adb5
diff --git a/analyzer/ras-data/ras-data-parser.cpp b/analyzer/ras-data/ras-data-parser.cpp
index 78ec9d2..559a947 100644
--- a/analyzer/ras-data/ras-data-parser.cpp
+++ b/analyzer/ras-data/ras-data-parser.cpp
@@ -199,9 +199,9 @@
auto priority = a.at("priority").get<std::string>();
// clang-format off
- static const std::map<std::string, ProcedureCallout::Type> m =
+ static const std::map<std::string, callout::Procedure> m =
{
- {"LEVEL2", ProcedureCallout::NEXTLVL},
+ {"LEVEL2", callout::Procedure::NEXTLVL},
};
// clang-format on
@@ -238,17 +238,17 @@
//------------------------------------------------------------------------------
-Callout::Priority RasDataParser::getPriority(const std::string& i_priority)
+callout::Priority RasDataParser::getPriority(const std::string& i_priority)
{
// clang-format off
- static const std::map<std::string, Callout::Priority> m =
+ static const std::map<std::string, callout::Priority> m =
{
- {"HIGH", Callout::HIGH},
- {"MED", Callout::MED},
- {"MED_A", Callout::MED_A},
- {"MED_B", Callout::MED_B},
- {"MED_C", Callout::MED_C},
- {"LOW", Callout::LOW},
+ {"HIGH", callout::Priority::HIGH},
+ {"MED", callout::Priority::MED},
+ {"MED_A", callout::Priority::MED_A},
+ {"MED_B", callout::Priority::MED_B},
+ {"MED_C", callout::Priority::MED_C},
+ {"LOW", callout::Priority::LOW},
};
// clang-format on