fix build error for arm platform

sonic-net · Nov 6, 2024 · 290102b · 290102b
1 parent 6b87876
commit 290102b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
@@ -691,7 +691,7 @@ void RouteOrch::doTask(Consumer& consumer)
                 NextHopGroupKey& nhg = ctx.nhg;
                 vector<string> srv6_segv;
                 vector<string> srv6_src;
-				vector<string> srv6_vpn_sidv;
+                vector<string> srv6_vpn_sidv;
                 bool l3Vni = true;
                 uint32_t vni = 0;
 

diff --git a/orchagent/srv6orch.cpp b/orchagent/srv6orch.cpp
@@ -154,7 +154,6 @@ bool Srv6Orch::removeSrv6Nexthops(const std::vector<NextHopGroupKey> &nhgv)
                 {
                     if (!deleteSrv6Vpn(sr_nh.ip_address.to_string(), sr_nh.srv6_vpn_sid, getAggId(it_nhg)))
                     {
-                        deleteAggId(it_nhg);
                         SWSS_LOG_ERROR("Failed to delete SRV6 vpn %s", sr_nh.to_string(false, true).c_str());
                         return false;
                     }
@@ -401,9 +400,6 @@ bool Srv6Orch::srv6Nexthops(const NextHopGroupKey &nhgKey, sai_object_id_t &next
             {
                 if (!createSrv6Vpn(it->ip_address.to_string(), it->srv6_vpn_sid, getAggId(nhgKey)))
                 {
-                    for (auto itt = nexthops.begin(); itt != it; ++itt)
-                        deleteSrv6Vpn(itt->ip_address.to_string(), itt->srv6_vpn_sid, getAggId(nhgKey));
-                    deleteAggId(nhgKey);
                     SWSS_LOG_ERROR("Failed to create SRV6 vpn %s", it->to_string(false, true).c_str());
                     return false;
                 }
@@ -1558,7 +1554,7 @@ task_process_status Srv6Orch::doTaskPicContextTable(const KeyOpFieldsValuesTuple
         }
         if (pci.nexthops.size() != pci.sids.size())
         {
-            SWSS_LOG_ERROR("inconsistent number of endpoints(%lu) and vpn sids(%lu)",
+            SWSS_LOG_ERROR("inconsistent number of endpoints(%zu) and vpn sids(%zu)",
                                 pci.nexthops.size(), pci.sids.size());
             return task_failed;
         }