mirror of
https://github.com/znc/znc.git
synced 2026-03-28 17:42:41 +01:00
Merge pull request #1835 from psychon/fix-odr-violation
Fix an ODR violation
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -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[] = {
|
||||
|
||||
Reference in New Issue
Block a user