[hash]: Handle review comments.

Signed-off-by: Nazarii Hnydyn <[email protected]>
nazariig · Nov 2, 2023 · c398098 · c398098
1 parent 4b3d4db
commit c398098
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/orchagent/switch/switch_capabilities.cpp b/orchagent/switch/switch_capabilities.cpp
@@ -1,16 +1,18 @@
 // includes -----------------------------------------------------------------------------------------------------------
 
 extern "C" {
+#include <saitypes.h>
 #include <saiobject.h>
 #include <saistatus.h>
-#include <saitypes.h>
+#include <saihash.h>
 #include <saiswitch.h>
 }
 
 #include <cstdint>
 #include <string>
 #include <vector>
 #include <set>
+#include <unordered_map>
 #include <algorithm>
 
 #include <sai_serialize.h>
@@ -81,28 +83,28 @@ extern sai_object_id_t gSwitchId;
 
 // functions ----------------------------------------------------------------------------------------------------------
 
-static std::string toStr(sai_object_type_t objType, sai_attr_id_t attrId) noexcept
+static std::string toStr(sai_object_type_t objType, sai_attr_id_t attrId)
 {
     const auto *meta = sai_metadata_get_attr_metadata(objType, attrId);
 
     return meta != nullptr ? meta->attridname : "UNKNOWN";
 }
 
-static std::string toStr(sai_native_hash_field_t value) noexcept
+static std::string toStr(sai_native_hash_field_t value)
 {
     const auto *name = sai_metadata_get_native_hash_field_name(value);
 
     return name != nullptr ? name : "UNKNOWN";
 }
 
-static std::string toStr(sai_hash_algorithm_t value) noexcept
+static std::string toStr(sai_hash_algorithm_t value)
 {
     const auto *name = sai_metadata_get_hash_algorithm_name(value);
 
     return name != nullptr ? name : "UNKNOWN";
 }
 
-static std::string toStr(const std::set<sai_native_hash_field_t> &value) noexcept
+static std::string toStr(const std::set<sai_native_hash_field_t> &value)
 {
     std::vector<std::string> strList;
 
@@ -118,7 +120,7 @@ static std::string toStr(const std::set<sai_native_hash_field_t> &value) noexcep
     return join(",", strList.cbegin(), strList.cend());
 }
 
-static std::string toStr(const std::set<sai_hash_algorithm_t> &value) noexcept
+static std::string toStr(const std::set<sai_hash_algorithm_t> &value)
 {
     std::vector<std::string> strList;
 
@@ -134,13 +136,13 @@ static std::string toStr(const std::set<sai_hash_algorithm_t> &value) noexcept
     return join(",", strList.cbegin(), strList.cend());
 }
 
-static std::string toStr(bool value) noexcept
+static std::string toStr(bool value)
 {
     return value ? "true" : "false";
 }
 
 template <typename T1, typename T2>
-static void insertBack(T1 &out, const T2 &in) noexcept
+static void insertBack(T1 &out, const T2 &in)
 {
     out.insert(out.end(), in.cbegin(), in.cend());
 }

diff --git a/orchagent/switch/switch_capabilities.h b/orchagent/switch/switch_capabilities.h
@@ -1,9 +1,10 @@
 #pragma once
 
 extern "C" {
-#include <saiobject.h>
 #include <saitypes.h>
+#include <saiobject.h>
 #include <saihash.h>
+#include <saiswitch.h>
 }
 
 #include <vector>

diff --git a/orchagent/switch/switch_helper.cpp b/orchagent/switch/switch_helper.cpp
@@ -1,5 +1,10 @@
 // includes -----------------------------------------------------------------------------------------------------------
 
+extern "C" {
+#include <saihash.h>
+#include <saiswitch.h>
+}
+
 #include <unordered_map>
 #include <unordered_set>
 #include <string>

diff --git a/orchagent/switch/switch_helper.h b/orchagent/switch/switch_helper.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <string>
+
 #include "switch_container.h"
 
 class SwitchHelper final