Merge pull request #30 from r12f/user/riffjiang/fix-merge

r12f · web-flow · commit 9005d187576e · 2025-02-28T12:08:03.000-08:00
[202412] Fix bad merge from automation PR #24
diff --git a/syncd/FlexCounter.cpp b/syncd/FlexCounter.cpp
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -2342,10 +2342,6 @@ std::shared_ptr<BaseCounterContext> FlexCounter::createCounterContext(`
`2342`	`2342`	`{`
`2343`	`2343`	`return std::make_shared<CounterContext<sai_policer_stat_t>>(context_name, instance, SAI_OBJECT_TYPE_POLICER, m_vendorSai.get(), m_statsMode);`
`2344`	`2344`	`}`
`2345`		`- else if (context_name == COUNTER_TYPE_POLICER)`
`2346`		`- {`
`2347`		`- return std::make_shared<CounterContext<sai_policer_stat_t>>(context_name, SAI_OBJECT_TYPE_POLICER, m_vendorSai.get(), m_statsMode);`
`2348`		`- }`
`2349`	`2345`
`2350`	`2346`	`SWSS_LOG_THROW("Invalid counter type %s", context_name.c_str());`
`2351`	`2347`	`// GCC 8.3 requires a return value here`