Merge insp20

[user/henk/code/inspircd.git] / include / configparser.h

diff --git a/include/configparser.h b/include/configparser.h
index 8292fdda5c6207182cd4129bdf6b27bcc41d4f2a..02619e759fe76b65f4c18a4d61471b6044b223ce 100644 (file)
--- a/include/configparser.h
+++ b/include/configparser.h
@@ -41,7 +41,7 @@ enum ParseFlags
 struct ParseStack
 {
        std::vector<std::string> reading;
-       std::map<std::string, std::string> vars;
+       insp::flat_map<std::string, std::string> vars;
        ConfigDataHash& output;
        ConfigFileCache& FilesOutput;
        std::stringstream& errstr;
@@ -53,8 +53,7 @@ struct ParseStack
                vars["quot"] = "\"";
                vars["newline"] = vars["nl"] = "\n";
        }
-       bool ParseFile(const std::string& name, int flags, const std::string& mandatory_tag = "");
-       bool ParseExec(const std::string& name, int flags, const std::string& mandatory_tag = "");
+       bool ParseFile(const std::string& name, int flags, const std::string& mandatory_tag = std::string(), bool isexec = false);
        void DoInclude(ConfigTag* includeTag, int flags);
        void DoReadFile(const std::string& key, const std::string& file, int flags, bool exec);
 };