Merge pull request #1835 from psychon/fix-odr-violation

Fix an ODR violation
This commit is contained in:
Alexey Sokolov
2022-08-07 14:20:40 +01:00
committed by GitHub
2 changed files with 4 additions and 0 deletions

View File

@@ -363,11 +363,13 @@ CString CIRCNetwork::GetNetworkPath() const {
return sNetworkPath;
}
namespace {
template <class T>
struct TOption {
const char* name;
void (CIRCNetwork::*pSetter)(T);
};
}
bool CIRCNetwork::ParseConfig(CConfig* pConfig, CString& sError,
bool bUpgrade) {

View File

@@ -135,11 +135,13 @@ CUser::~CUser() {
CZNC::Get().AddBytesWritten(m_uBytesWritten);
}
namespace {
template <class T>
struct TOption {
const char* name;
void (CUser::*pSetter)(T);
};
}
bool CUser::ParseConfig(CConfig* pConfig, CString& sError) {
TOption<const CString&> StringOptions[] = {