summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2017-04-06 11:39:35 -0400
committerAdam <Adam@anope.org>2017-04-06 11:39:35 -0400
commit7f5cb607af73a4134a158a14006bdc3e202d0a34 (patch)
treebe7a55aa6afbd8ee363dced53aa9c0a69bfb36a3 /include
parent805ea3869c33889de3695c580b85e10d9a4bc147 (diff)
Fix some more compiler warnings
Diffstat (limited to 'include')
-rw-r--r--include/config.h2
-rw-r--r--include/defs.h1
-rw-r--r--include/modes.h2
-rw-r--r--include/serialize.h2
4 files changed, 4 insertions, 3 deletions
diff --git a/include/config.h b/include/config.h
index b6b36b726..25c8f6166 100644
--- a/include/config.h
+++ b/include/config.h
@@ -26,7 +26,7 @@ namespace Configuration
{
class CoreExport Block
{
- friend struct Conf;
+ friend class Conf;
public:
typedef Anope::map<Anope::string> item_map;
diff --git a/include/defs.h b/include/defs.h
index 989ce3e5b..bd4f2871e 100644
--- a/include/defs.h
+++ b/include/defs.h
@@ -33,7 +33,6 @@ struct ChanUserContainer;
class ClientSocket;
class Command;
class CommandSource;
-namespace Configuration { struct Conf; }
class ConnectionSocket;
class Entry;
class ExtensibleBase;
diff --git a/include/modes.h b/include/modes.h
index 706b0b716..49e923cda 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -23,6 +23,8 @@
#include "anope.h"
#include "base.h"
+namespace Configuration { class Conf; }
+
/** The different types of modes
*/
enum ModeType
diff --git a/include/serialize.h b/include/serialize.h
index 8137e18e9..497e28866 100644
--- a/include/serialize.h
+++ b/include/serialize.h
@@ -718,7 +718,7 @@ class Serialize::ObjectField : public CommonFieldBase<TypeImpl, T>
this->is_object = true;
}
- T GetField(TypeImpl *s)
+ T GetField(TypeImpl *s) override
{
T *t = this->Get_(s);