From 56ba6de3bfa509d38ca41757c756b3d5071904b3 Mon Sep 17 00:00:00 2001 From: mint570 <70396898+mint570@users.noreply.github.com> Date: Mon, 8 Apr 2024 17:13:14 -0700 Subject: [PATCH] [p4orch] Clang format change. (#3096) What I did [p4orch] This PR has no real code change. It is purely clang formatting. It does the same as #3080. --- orchagent/p4orch/acl_rule_manager.cpp | 2 +- orchagent/p4orch/acl_table_manager.cpp | 2 +- orchagent/p4orch/acl_util.cpp | 3 +- orchagent/p4orch/acl_util.h | 6 +-- orchagent/p4orch/ext_tables_manager.cpp | 26 ++++++++----- orchagent/p4orch/ext_tables_manager.h | 4 +- orchagent/p4orch/gre_tunnel_manager.cpp | 2 +- orchagent/p4orch/l3_admit_manager.cpp | 2 +- orchagent/p4orch/mirror_session_manager.cpp | 2 +- orchagent/p4orch/neighbor_manager.cpp | 2 +- orchagent/p4orch/next_hop_manager.cpp | 2 +- orchagent/p4orch/p4orch_util.cpp | 2 +- orchagent/p4orch/route_manager.cpp | 2 +- orchagent/p4orch/router_interface_manager.cpp | 2 +- .../p4orch/tables_definition_manager.cpp | 39 ++++++++++++------- orchagent/p4orch/tables_definition_manager.h | 4 +- orchagent/p4orch/tests/acl_manager_test.cpp | 2 +- .../p4orch/tests/gre_tunnel_manager_test.cpp | 2 +- .../p4orch/tests/l3_admit_manager_test.cpp | 2 +- .../tests/mirror_session_manager_test.cpp | 2 +- .../p4orch/tests/neighbor_manager_test.cpp | 2 +- .../p4orch/tests/next_hop_manager_test.cpp | 2 +- orchagent/p4orch/tests/route_manager_test.cpp | 2 +- orchagent/p4orch/tests/wcmp_manager_test.cpp | 2 +- orchagent/p4orch/wcmp_manager.cpp | 2 +- 25 files changed, 70 insertions(+), 50 deletions(-) diff --git a/orchagent/p4orch/acl_rule_manager.cpp b/orchagent/p4orch/acl_rule_manager.cpp index 7989bfa9e6..5131b718ac 100644 --- a/orchagent/p4orch/acl_rule_manager.cpp +++ b/orchagent/p4orch/acl_rule_manager.cpp @@ -1,5 +1,6 @@ #include "p4orch/acl_rule_manager.h" +#include #include #include #include @@ -17,7 +18,6 @@ #include "sai_serialize.h" #include "table.h" #include "tokenize.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/acl_table_manager.cpp b/orchagent/p4orch/acl_table_manager.cpp index abfedbda0c..4a3910992e 100644 --- a/orchagent/p4orch/acl_table_manager.cpp +++ b/orchagent/p4orch/acl_table_manager.cpp @@ -1,5 +1,6 @@ #include "p4orch/acl_table_manager.h" +#include #include #include #include @@ -15,7 +16,6 @@ #include "switchorch.h" #include "table.h" #include "tokenize.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/acl_util.cpp b/orchagent/p4orch/acl_util.cpp index ad943e6ee9..5ab2276b4d 100644 --- a/orchagent/p4orch/acl_util.cpp +++ b/orchagent/p4orch/acl_util.cpp @@ -1,11 +1,12 @@ #include "p4orch/acl_util.h" +#include + #include "converter.h" #include "logger.h" #include "sai_serialize.h" #include "table.h" #include "tokenize.h" -#include namespace p4orch { diff --git a/orchagent/p4orch/acl_util.h b/orchagent/p4orch/acl_util.h index 37522fd164..b4123d0754 100644 --- a/orchagent/p4orch/acl_util.h +++ b/orchagent/p4orch/acl_util.h @@ -1,13 +1,13 @@ #pragma once #include +#include #include #include #include #include "p4orch/p4orch_util.h" #include "return_code.h" -#include extern "C" { #include "sai.h" @@ -243,7 +243,7 @@ struct P4AclTableDefinition P4AclTableDefinition(const std::string &acl_table_name, const sai_acl_stage_t stage, const uint32_t priority, const uint32_t size, const std::string &meter_unit, const std::string &counter_unit) : acl_table_name(acl_table_name), stage(stage), priority(priority), size(size), meter_unit(meter_unit), - counter_unit(counter_unit){}; + counter_unit(counter_unit) {}; }; struct P4UserDefinedTrapHostifTableEntry @@ -251,7 +251,7 @@ struct P4UserDefinedTrapHostifTableEntry sai_object_id_t user_defined_trap; sai_object_id_t hostif_table_entry; P4UserDefinedTrapHostifTableEntry() - : user_defined_trap(SAI_NULL_OBJECT_ID), hostif_table_entry(SAI_NULL_OBJECT_ID){}; + : user_defined_trap(SAI_NULL_OBJECT_ID), hostif_table_entry(SAI_NULL_OBJECT_ID) {}; }; using acl_rule_attr_lookup_t = std::map; diff --git a/orchagent/p4orch/ext_tables_manager.cpp b/orchagent/p4orch/ext_tables_manager.cpp index 09bf7ccbe4..ae091fcd77 100644 --- a/orchagent/p4orch/ext_tables_manager.cpp +++ b/orchagent/p4orch/ext_tables_manager.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -14,7 +15,6 @@ #include "p4orch/p4orch.h" #include "p4orch/p4orch_util.h" #include "tokenize.h" -#include extern sai_counter_api_t *sai_counter_api; extern sai_generic_programmable_api_t *sai_generic_programmable_api; @@ -111,15 +111,18 @@ ReturnCode ExtTablesManager::validateActionParamsCrossRef(P4ExtTableAppDbEntry & SWSS_LOG_ERROR("Cross-table reference validation failed from extension-table %s", table_name.c_str()); return ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM) - << "Cross-table reference valdiation failed from extension table"; + << "Cross-table reference valdiation failed from extension " + "table"; } } else { - SWSS_LOG_ERROR("Cross-table reference validation failed due to non-existent table %s", + SWSS_LOG_ERROR("Cross-table reference validation failed due to non-existent table " + "%s", table_name.c_str()); return ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM) - << "Cross-table reference valdiation failed due to non-existent table"; + << "Cross-table reference valdiation failed due to non-existent " + "table"; } } @@ -132,7 +135,8 @@ ReturnCode ExtTablesManager::validateActionParamsCrossRef(P4ExtTableAppDbEntry & if (oid == SAI_NULL_OBJECT_ID) { - SWSS_LOG_ERROR("Cross-table reference validation failed, null OID expected from table %s", + SWSS_LOG_ERROR("Cross-table reference validation failed, null OID expected from " + "table %s", table_name.c_str()); return ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM) << "Cross-table reference valdiation failed, null OID"; } @@ -724,7 +728,8 @@ void ExtTablesManager::drain() SWSS_LOG_ERROR("Unable to deserialize APP DB entry with key %s: %s", QuotedVar(kfvKey(key_op_fvs_tuple)).c_str(), status.message().c_str()); m_publisher->publish(APP_P4RT_TABLE_NAME, kfvKey(key_op_fvs_tuple), - kfvFieldsValues(key_op_fvs_tuple), status, /*replace=*/true); + kfvFieldsValues(key_op_fvs_tuple), status, + /*replace=*/true); continue; } @@ -735,7 +740,8 @@ void ExtTablesManager::drain() SWSS_LOG_ERROR("Validation failed for extension APP DB entry with key %s: %s", QuotedVar(kfvKey(key_op_fvs_tuple)).c_str(), status.message().c_str()); m_publisher->publish(APP_P4RT_TABLE_NAME, kfvKey(key_op_fvs_tuple), - kfvFieldsValues(key_op_fvs_tuple), status, /*replace=*/true); + kfvFieldsValues(key_op_fvs_tuple), status, + /*replace=*/true); continue; } @@ -772,7 +778,8 @@ void ExtTablesManager::drain() QuotedVar(kfvKey(key_op_fvs_tuple)).c_str(), status.message().c_str()); } m_publisher->publish(APP_P4RT_TABLE_NAME, kfvKey(key_op_fvs_tuple), kfvFieldsValues(key_op_fvs_tuple), - status, /*replace=*/true); + status, + /*replace=*/true); } it_m->second.clear(); @@ -833,7 +840,8 @@ void ExtTablesManager::doExtCounterStatsTask() sai_counter_api->get_counter_stats(ext_table_entry->sai_counter_oid, 2, stat_ids, stats); if (sai_status != SAI_STATUS_SUCCESS) { - SWSS_LOG_WARN("Failed to set counters stats for extension entry %s:%s in COUNTERS_DB: ", + SWSS_LOG_WARN("Failed to set counters stats for extension entry %s:%s in " + "COUNTERS_DB: ", table_name.c_str(), ext_table_entry->table_key.c_str()); continue; } diff --git a/orchagent/p4orch/ext_tables_manager.h b/orchagent/p4orch/ext_tables_manager.h index e45a2566ca..82256f72ba 100644 --- a/orchagent/p4orch/ext_tables_manager.h +++ b/orchagent/p4orch/ext_tables_manager.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include @@ -14,7 +15,6 @@ #include "response_publisher_interface.h" #include "return_code.h" #include "vrforch.h" -#include extern "C" { #include "sai.h" @@ -29,7 +29,7 @@ struct P4ExtTableEntry sai_object_id_t sai_counter_oid = SAI_NULL_OBJECT_ID; std::unordered_map action_dep_objects; - P4ExtTableEntry(){}; + P4ExtTableEntry() {}; P4ExtTableEntry(const std::string &db_key, const std::string &table_name, const std::string &table_key) : db_key(db_key), table_name(table_name), table_key(table_key) { diff --git a/orchagent/p4orch/gre_tunnel_manager.cpp b/orchagent/p4orch/gre_tunnel_manager.cpp index a46dc0fd38..c3bfd7d6d7 100644 --- a/orchagent/p4orch/gre_tunnel_manager.cpp +++ b/orchagent/p4orch/gre_tunnel_manager.cpp @@ -1,6 +1,7 @@ #include "p4orch/gre_tunnel_manager.h" #include +#include #include #include #include @@ -14,7 +15,6 @@ #include "sai_serialize.h" #include "swssnet.h" #include "table.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/l3_admit_manager.cpp b/orchagent/p4orch/l3_admit_manager.cpp index 2440dd2a0c..da5b955dba 100644 --- a/orchagent/p4orch/l3_admit_manager.cpp +++ b/orchagent/p4orch/l3_admit_manager.cpp @@ -1,6 +1,7 @@ #include "p4orch/l3_admit_manager.h" #include +#include #include #include #include @@ -14,7 +15,6 @@ #include "sai_serialize.h" #include "table.h" #include "tokenize.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/mirror_session_manager.cpp b/orchagent/p4orch/mirror_session_manager.cpp index 440257ea1d..e562b87ff5 100644 --- a/orchagent/p4orch/mirror_session_manager.cpp +++ b/orchagent/p4orch/mirror_session_manager.cpp @@ -1,6 +1,7 @@ #include "p4orch/mirror_session_manager.h" #include +#include #include "SaiAttributeList.h" #include "dbconnector.h" @@ -10,7 +11,6 @@ #include "swss/logger.h" #include "swssnet.h" #include "table.h" -#include using ::p4orch::kTableKeyDelimiter; diff --git a/orchagent/p4orch/neighbor_manager.cpp b/orchagent/p4orch/neighbor_manager.cpp index 75075a13a6..f68f22a545 100644 --- a/orchagent/p4orch/neighbor_manager.cpp +++ b/orchagent/p4orch/neighbor_manager.cpp @@ -1,5 +1,6 @@ #include "p4orch/neighbor_manager.h" +#include #include #include #include @@ -13,7 +14,6 @@ #include "sai_serialize.h" #include "swssnet.h" #include "table.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/next_hop_manager.cpp b/orchagent/p4orch/next_hop_manager.cpp index b5586ae233..f55c83534a 100644 --- a/orchagent/p4orch/next_hop_manager.cpp +++ b/orchagent/p4orch/next_hop_manager.cpp @@ -1,5 +1,6 @@ #include "p4orch/next_hop_manager.h" +#include #include #include #include @@ -14,7 +15,6 @@ #include "sai_serialize.h" #include "swssnet.h" #include "table.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/p4orch_util.cpp b/orchagent/p4orch/p4orch_util.cpp index ceb46b4b01..dd0a4171ad 100644 --- a/orchagent/p4orch/p4orch_util.cpp +++ b/orchagent/p4orch/p4orch_util.cpp @@ -1,6 +1,6 @@ #include "p4orch/p4orch_util.h" -#include "p4orch/p4orch.h" +#include "p4orch/p4orch.h" #include "schema.h" using ::p4orch::kTableKeyDelimiter; diff --git a/orchagent/p4orch/route_manager.cpp b/orchagent/p4orch/route_manager.cpp index 1e69de5d17..c50b3bb4b9 100644 --- a/orchagent/p4orch/route_manager.cpp +++ b/orchagent/p4orch/route_manager.cpp @@ -1,6 +1,7 @@ #include "p4orch/route_manager.h" #include +#include #include #include #include @@ -16,7 +17,6 @@ #include "sai_serialize.h" #include "swssnet.h" #include "table.h" -#include using ::p4orch::kTableKeyDelimiter; diff --git a/orchagent/p4orch/router_interface_manager.cpp b/orchagent/p4orch/router_interface_manager.cpp index 8074cc49ec..de32576e68 100644 --- a/orchagent/p4orch/router_interface_manager.cpp +++ b/orchagent/p4orch/router_interface_manager.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -17,7 +18,6 @@ #include "sai_serialize.h" #include "table.h" #include "vrforch.h" -#include using ::p4orch::kTableKeyDelimiter; diff --git a/orchagent/p4orch/tables_definition_manager.cpp b/orchagent/p4orch/tables_definition_manager.cpp index 7790458cfc..1da15028e5 100644 --- a/orchagent/p4orch/tables_definition_manager.cpp +++ b/orchagent/p4orch/tables_definition_manager.cpp @@ -1,6 +1,7 @@ #include "p4orch/tables_definition_manager.h" #include +#include #include #include #include @@ -12,7 +13,6 @@ #include "p4orch/p4orch.h" #include "p4orch/p4orch_util.h" #include "tokenize.h" -#include extern "C" { #include "saitypes.h" @@ -100,7 +100,8 @@ ReturnCode parseTableMatchReferences(const nlohmann::json &match_json, TableMatc catch (std::exception &ex) { return ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM) - << "can not parse tables from app-db supplied table definition info"; + << "can not parse tables from app-db supplied table definition " + "info"; } } } @@ -125,7 +126,8 @@ ReturnCode parseActionParamReferences(const nlohmann::json ¶m_json, ActionPa catch (std::exception &ex) { return ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM) - << "can not parse tables from app-db supplied table definition info"; + << "can not parse tables from app-db supplied table definition " + "info"; } } } @@ -155,7 +157,8 @@ ReturnCode parseTableActionParams(const nlohmann::json &action_json, ActionInfo if (!param.table_reference_map.empty()) { /** - * Helps avoid walk of action parameters if this is set to false at action level + * Helps avoid walk of action parameters if this is set to false at + * action level */ action.refers_to = true; } @@ -163,7 +166,8 @@ ReturnCode parseTableActionParams(const nlohmann::json &action_json, ActionInfo catch (std::exception &ex) { return ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM) - << "can not parse tables from app-db supplied table definition info"; + << "can not parse tables from app-db supplied table definition " + "info"; } } } @@ -215,7 +219,8 @@ ReturnCode parseTablesInfo(const nlohmann::json &info_json, TablesInfo &info_ent catch (std::exception &ex) { return ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM) - << "can not parse tables from app-db supplied table definition info"; + << "can not parse tables from app-db supplied table definition " + "info"; } TableInfo table = {}; @@ -247,8 +252,8 @@ ReturnCode parseTablesInfo(const nlohmann::json &info_json, TablesInfo &info_ent table.action_fields[action_name] = action; /** - * If any parameter of action refers to another table, add that one in the - * cross-reference list of current table + * If any parameter of action refers to another table, add that one in + * the cross-reference list of current table */ for (auto param_it = action.params.begin(); param_it != action.params.end(); param_it++) { @@ -466,7 +471,8 @@ std::vector findTablePrecedence(int tables, std::vector for (int i = 0; i < tables; i++) { - // Err input data like possible cyclic dependencies, could not build precedence order + // Err input data like possible cyclic dependencies, could not build + // precedence order if (zeros.empty()) { SWSS_LOG_ERROR("Filed to build table precedence order"); @@ -546,7 +552,8 @@ void buildTablePrecedence(TablesInfo *tables_info) // find precedence of tables based on dependencies orderedTables = findTablePrecedence(tables, preReq, tables_info); - // update each table with calculated precedence value and build table precedence map + // update each table with calculated precedence value and build table + // precedence map for (std::size_t i = 0; i < orderedTables.size(); i++) { auto table_id = orderedTables[i]; @@ -593,7 +600,8 @@ void TablesDefnManager::drain() SWSS_LOG_ERROR("Unable to deserialize APP DB entry with key %s: %s", QuotedVar(table_name + ":" + key).c_str(), status.message().c_str()); m_publisher->publish(APP_P4RT_TABLE_NAME, kfvKey(key_op_fvs_tuple), kfvFieldsValues(key_op_fvs_tuple), - status, /*replace=*/true); + status, + /*replace=*/true); continue; } auto &app_db_entry = *app_db_entry_or; @@ -601,10 +609,12 @@ void TablesDefnManager::drain() status = validateTablesInfoAppDbEntry(app_db_entry); if (!status.ok()) { - SWSS_LOG_ERROR("Validation failed for tables definition APP DB entry with key %s: %s", + SWSS_LOG_ERROR("Validation failed for tables definition APP DB entry with key %s: " + "%s", QuotedVar(table_name + ":" + key).c_str(), status.message().c_str()); m_publisher->publish(APP_P4RT_TABLE_NAME, kfvKey(key_op_fvs_tuple), kfvFieldsValues(key_op_fvs_tuple), - status, /*replace=*/true); + status, + /*replace=*/true); continue; } @@ -637,7 +647,8 @@ void TablesDefnManager::drain() } if (!status.ok()) { - SWSS_LOG_ERROR("Processing failed for tables definition APP DB entry with key %s: %s", + SWSS_LOG_ERROR("Processing failed for tables definition APP DB entry with key %s: " + "%s", QuotedVar(table_name + ":" + key).c_str(), status.message().c_str()); } else diff --git a/orchagent/p4orch/tables_definition_manager.h b/orchagent/p4orch/tables_definition_manager.h index ffe8b62857..85ca363bf5 100644 --- a/orchagent/p4orch/tables_definition_manager.h +++ b/orchagent/p4orch/tables_definition_manager.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include @@ -12,7 +13,6 @@ #include "p4orch/p4orch_util.h" #include "response_publisher_interface.h" #include "return_code.h" -#include extern "C" { #include "sai.h" @@ -29,7 +29,7 @@ struct TablesInfo std::unordered_map m_tableInfoMap; std::map m_tablePrecedenceMap; - TablesInfo(){}; + TablesInfo() {}; TablesInfo(const std::string &context_key, const nlohmann::json &info_value) : context(context_key), info(info_value) { diff --git a/orchagent/p4orch/tests/acl_manager_test.cpp b/orchagent/p4orch/tests/acl_manager_test.cpp index 515cab853f..107dfdfde5 100644 --- a/orchagent/p4orch/tests/acl_manager_test.cpp +++ b/orchagent/p4orch/tests/acl_manager_test.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include "acl_rule_manager.h" @@ -21,7 +22,6 @@ #include "table.h" #include "tokenize.h" #include "vrforch.h" -#include using ::p4orch::kTableKeyDelimiter; diff --git a/orchagent/p4orch/tests/gre_tunnel_manager_test.cpp b/orchagent/p4orch/tests/gre_tunnel_manager_test.cpp index f546e09ef7..da3ae3578b 100644 --- a/orchagent/p4orch/tests/gre_tunnel_manager_test.cpp +++ b/orchagent/p4orch/tests/gre_tunnel_manager_test.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -17,7 +18,6 @@ #include "p4orch_util.h" #include "return_code.h" #include "swssnet.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/tests/l3_admit_manager_test.cpp b/orchagent/p4orch/tests/l3_admit_manager_test.cpp index 8b246050c9..0fa5cb7ac3 100644 --- a/orchagent/p4orch/tests/l3_admit_manager_test.cpp +++ b/orchagent/p4orch/tests/l3_admit_manager_test.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -13,7 +14,6 @@ #include "p4orch/p4orch_util.h" #include "p4orch_util.h" #include "return_code.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/tests/mirror_session_manager_test.cpp b/orchagent/p4orch/tests/mirror_session_manager_test.cpp index 503060e231..1361fc96b3 100644 --- a/orchagent/p4orch/tests/mirror_session_manager_test.cpp +++ b/orchagent/p4orch/tests/mirror_session_manager_test.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include @@ -14,7 +15,6 @@ #include "swss/ipaddress.h" #include "swss/macaddress.h" #include "swssnet.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/tests/neighbor_manager_test.cpp b/orchagent/p4orch/tests/neighbor_manager_test.cpp index 8dd62615c8..4db1db873e 100644 --- a/orchagent/p4orch/tests/neighbor_manager_test.cpp +++ b/orchagent/p4orch/tests/neighbor_manager_test.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include @@ -12,7 +13,6 @@ #include "p4orch/p4orch_util.h" #include "return_code.h" #include "swssnet.h" -#include using ::p4orch::kTableKeyDelimiter; diff --git a/orchagent/p4orch/tests/next_hop_manager_test.cpp b/orchagent/p4orch/tests/next_hop_manager_test.cpp index cc01c82920..7a2e714bbc 100644 --- a/orchagent/p4orch/tests/next_hop_manager_test.cpp +++ b/orchagent/p4orch/tests/next_hop_manager_test.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -17,7 +18,6 @@ #include "p4orch.h" #include "return_code.h" #include "swssnet.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/tests/route_manager_test.cpp b/orchagent/p4orch/tests/route_manager_test.cpp index 67b4b4f7c9..6229f69c36 100644 --- a/orchagent/p4orch/tests/route_manager_test.cpp +++ b/orchagent/p4orch/tests/route_manager_test.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -16,7 +17,6 @@ #include "return_code.h" #include "swssnet.h" #include "vrforch.h" -#include using ::p4orch::kTableKeyDelimiter; diff --git a/orchagent/p4orch/tests/wcmp_manager_test.cpp b/orchagent/p4orch/tests/wcmp_manager_test.cpp index 29897d5d06..088264bba4 100644 --- a/orchagent/p4orch/tests/wcmp_manager_test.cpp +++ b/orchagent/p4orch/tests/wcmp_manager_test.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include "mock_response_publisher.h" @@ -17,7 +18,6 @@ #include "p4orch_util.h" #include "return_code.h" #include "sai_serialize.h" -#include extern "C" { #include "sai.h" diff --git a/orchagent/p4orch/wcmp_manager.cpp b/orchagent/p4orch/wcmp_manager.cpp index d81ce1d44e..81c373b16f 100644 --- a/orchagent/p4orch/wcmp_manager.cpp +++ b/orchagent/p4orch/wcmp_manager.cpp @@ -1,5 +1,6 @@ #include "p4orch/wcmp_manager.h" +#include #include #include #include @@ -12,7 +13,6 @@ #include "portsorch.h" #include "sai_serialize.h" #include "table.h" -#include extern "C" { #include "sai.h"