Refine syntax: expose overloaded inherited functions (sonic-net#376)

madhanmellanox · Nov 9, 2017 · 165e2dc · 165e2dc
1 parent 64d5a5a
commit 165e2dc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/cfgmgr/intfmgr.h b/cfgmgr/intfmgr.h
@@ -14,6 +14,7 @@ class IntfMgr : public Orch
 {
 public:
     IntfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames);
+    using Orch::doTask;
 
 private:
     ProducerStateTable m_appIntfTableProducer;

diff --git a/cfgmgr/intfmgrd.cpp b/cfgmgr/intfmgrd.cpp
@@ -75,7 +75,7 @@ int main(int argc, char **argv)
             }
             if (ret == Select::TIMEOUT)
             {
-               ((Orch *)&intfmgr)->doTask();
+                intfmgr.doTask();
                 continue;
             }
 

diff --git a/cfgmgr/vlanmgr.cpp b/cfgmgr/vlanmgr.cpp
@@ -167,12 +167,11 @@ bool VlanMgr::removeHostVlanMember(int vlan_id, const string &port_alias)
 
 bool VlanMgr::isVlanMacOk()
 {
-    return !(!gMacAddress);
+    return !!gMacAddress;
 }
 
 void VlanMgr::doVlanTask(Consumer &consumer)
 {
-
     if (!isVlanMacOk())
     {
         SWSS_LOG_DEBUG("VLAN mac not ready, delaying VLAN task");

diff --git a/cfgmgr/vlanmgr.h b/cfgmgr/vlanmgr.h
@@ -15,6 +15,7 @@ class VlanMgr : public Orch
 {
 public:
     VlanMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames);
+    using Orch::doTask;
 
 private:
     ProducerStateTable m_appVlanTableProducer, m_appVlanMemberTableProducer;

diff --git a/cfgmgr/vlanmgrd.cpp b/cfgmgr/vlanmgrd.cpp
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
             }
             if (ret == Select::TIMEOUT)
             {
-                ((Orch *)&vlanmgr)->doTask();
+                vlanmgr.doTask();
                 continue;
             }