From 020c1d6ea658956e7cb2462a748790a4f4e30787 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Mon, 16 Oct 2017 02:37:57 +0100 Subject: Add a constructor to OperInfo and use it to set the type name. --- src/configreader.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/configreader.cpp') diff --git a/src/configreader.cpp b/src/configreader.cpp index 6471413e0..2a50a22b3 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -158,9 +158,8 @@ void ServerConfig::CrossCheckOperClassType() if (OperTypes.find(name) != OperTypes.end()) throw CoreException("Duplicate type block with name " + name + " at " + tag->getTagLocation()); - OperInfo* ifo = new OperInfo; + OperInfo* ifo = new OperInfo(name); OperTypes[name] = ifo; - ifo->name = name; ifo->type_block = tag; std::string classname; @@ -190,8 +189,7 @@ void ServerConfig::CrossCheckOperClassType() if (oper_blocks.find(name) != oper_blocks.end()) throw CoreException("Duplicate oper block with name " + name + " at " + tag->getTagLocation()); - OperInfo* ifo = new OperInfo; - ifo->name = type; + OperInfo* ifo = new OperInfo(type); ifo->oper_block = tag; ifo->type_block = tblk->second->type_block; ifo->class_blocks.assign(tblk->second->class_blocks.begin(), tblk->second->class_blocks.end()); -- cgit v1.3.1-10-gc9f91