Skip to content

Commit 4be4c39

Browse files
committed
Renaming the newly added function in swss::RedisSelect to getDbConnectorId() as it was clashing with swss::TableBase::getDbId()
1 parent 92eacae commit 4be4c39

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

common/redisselect.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ int RedisSelect::getFd()
1616
{
1717
return m_subscribe->getContext()->fd;
1818
}
19-
int RedisSelect::getDbId()
19+
int RedisSelect::getDbConnectorId()
2020
{
2121
return m_subscribe->getDbId();
2222
}

common/redisselect.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class RedisSelect : public Selectable
2020
bool hasCachedData() override;
2121
bool initializedWithData() override;
2222
void updateAfterRead() override;
23-
int getDbId() override;
23+
int getDbConnectorId() override;
2424
std::string getDbNamespace() override;
2525

2626
/* Create a new redisContext, SELECT DB and SUBSCRIBE */

common/selectable.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Selectable
5858
return m_priority;
5959
}
6060

61-
virtual int getDbId()
61+
virtual int getDbConnectorId()
6262
{
6363
return 0;
6464
}

0 commit comments

Comments
 (0)