From 33a987368e577c117bff53c240b9a3167a981056 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 3 Nov 2020 19:01:53 +0000 Subject: Replace ConfigTag::create with a public constructor. --- src/configreader.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'src/configreader.cpp') diff --git a/src/configreader.cpp b/src/configreader.cpp index dd0fe826a..5a3fc8c1c 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -60,14 +60,8 @@ ServerConfig::ServerPaths::ServerPaths(std::shared_ptr tag) { } -static std::shared_ptr CreateEmptyTag() -{ - ConfigTag::Items* items; - return ConfigTag::create("empty", "", 0, items); -} - ServerConfig::ServerConfig() - : EmptyTag(CreateEmptyTag()) + : EmptyTag(std::make_shared("empty", "", 0)) , Limits(EmptyTag) , Paths(EmptyTag) , CaseMapping("ascii") @@ -181,9 +175,8 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current) if (blk_count == 0) { // No connect blocks found; make a trivial default block - ConfigTag::Items* items; - auto tag = ConfigTag::create("connect", "", 0, items); - (*items)["allow"] = "*"; + auto tag = std::make_shared("connect", "", 0); + tag->GetItems()["allow"] = "*"; config_data.insert(std::make_pair("connect", tag)); blk_count = 1; } -- cgit v1.3.1-10-gc9f91