Skip to content

Commit

Permalink
Merge pull request #30 from r12f/user/riffjiang/fix-merge
Browse files Browse the repository at this point in the history
[202412] Fix bad merge from automation PR #24
  • Loading branch information
r12f authored Feb 28, 2025
2 parents c29f53d + f669e97 commit 9005d18
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions syncd/FlexCounter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2342,10 +2342,6 @@ std::shared_ptr<BaseCounterContext> FlexCounter::createCounterContext(
{
return std::make_shared<CounterContext<sai_policer_stat_t>>(context_name, instance, SAI_OBJECT_TYPE_POLICER, m_vendorSai.get(), m_statsMode);
}
else if (context_name == COUNTER_TYPE_POLICER)
{
return std::make_shared<CounterContext<sai_policer_stat_t>>(context_name, SAI_OBJECT_TYPE_POLICER, m_vendorSai.get(), m_statsMode);
}

SWSS_LOG_THROW("Invalid counter type %s", context_name.c_str());
// GCC 8.3 requires a return value here
Expand Down

0 comments on commit 9005d18

Please sign in to comment.