diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-10-13 19:07:44 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-10-13 19:07:44 +0200 |
| commit | 9bb839b6a2873a366ac8685c3c8846b6837f85ca (patch) | |
| tree | 34b4fdfa7ba3419081089790d1665c5abc249719 /include | |
| parent | 44542c1f1acabbf00f8f468f3bb837c5a8b2736e (diff) | |
| parent | 6935ce2956fed99d5484da90e614b7126e5275d3 (diff) | |
Merge pull request #933 from SaberUK/insp20+fix-llvm34
Fix various warnings when building with LLVM 3.5.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 5 | ||||
| -rw-r--r-- | include/modules.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/configreader.h b/include/configreader.h index 1edacfe13..b01a979a7 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -197,6 +197,9 @@ class CoreExport ServerConfig ConfigTagList ConfTags(const std::string& tag); + /** An empty configuration tag. */ + ConfigTag* EmptyTag; + /** Error stream, contains error output from any failed configuration parsing. */ std::stringstream errstr; @@ -527,6 +530,8 @@ class CoreExport ServerConfig */ ServerConfig(); + ~ServerConfig(); + /** Get server ID as string with required leading zeroes */ const std::string& GetSID(); diff --git a/include/modules.h b/include/modules.h index eef8c61c9..cd0d5aad0 100644 --- a/include/modules.h +++ b/include/modules.h @@ -116,7 +116,7 @@ struct ModResult { * and numerical comparisons in preprocessor macros if they wish to support * multiple versions of InspIRCd in one file. */ -#define INSPIRCD_VERSION_API 8 +#define INSPIRCD_VERSION_API 9 /** * This #define allows us to call a method in all |