aboutsummaryrefslogtreecommitdiffstats
path: root/src/configreader.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2020-11-03 19:01:53 +0000
committerGravatar Sadie Powell2020-11-03 19:54:13 +0000
commit33a987368e577c117bff53c240b9a3167a981056 (patch)
treeb015b1cffb0c829234ebb97112bf61825d78b8bc /src/configreader.cpp
parentRename ConfigItems to ConfigTag::Items. (diff)
downloadinspircd++-33a987368e577c117bff53c240b9a3167a981056.tar.gz
inspircd++-33a987368e577c117bff53c240b9a3167a981056.tar.bz2
inspircd++-33a987368e577c117bff53c240b9a3167a981056.zip
Replace ConfigTag::create with a public constructor.
Diffstat (limited to 'src/configreader.cpp')
-rw-r--r--src/configreader.cpp13
1 files changed, 3 insertions, 10 deletions
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<ConfigTag> tag)
{
}
-static std::shared_ptr<ConfigTag> CreateEmptyTag()
-{
- ConfigTag::Items* items;
- return ConfigTag::create("empty", "<auto>", 0, items);
-}
-
ServerConfig::ServerConfig()
- : EmptyTag(CreateEmptyTag())
+ : EmptyTag(std::make_shared<ConfigTag>("empty", "<auto>", 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", "<auto>", 0, items);
- (*items)["allow"] = "*";
+ auto tag = std::make_shared<ConfigTag>("connect", "<auto>", 0);
+ tag->GetItems()["allow"] = "*";
config_data.insert(std::make_pair("connect", tag));
blk_count = 1;
}