diff options
| author | Adam <Adam@anope.org> | 2016-11-30 13:13:41 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2016-11-30 14:02:45 -0500 |
| commit | 2f512281029fbf4f7ef9832e05804831ad2d9ba2 (patch) | |
| tree | 10699640af6519991e2de009ffb4317daf4afd79 /include | |
| parent | a2047d559972df3e3a1e423827c449accbe1ddd1 (diff) | |
Fix some field shadowing warnings
Diffstat (limited to 'include')
| -rw-r--r-- | include/protocol.h | 4 | ||||
| -rw-r--r-- | include/serialize.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/protocol.h b/include/protocol.h index f7e7460f0..7475fed21 100644 --- a/include/protocol.h +++ b/include/protocol.h @@ -340,9 +340,9 @@ class IRCMessage return source; } - void SetSource(const MessageSource &source) + void SetSource(const MessageSource &_source) { - this->source = source; + this->source = _source; } const Anope::string &GetCommand() const diff --git a/include/serialize.h b/include/serialize.h index cec6d225d..0b420bff0 100644 --- a/include/serialize.h +++ b/include/serialize.h @@ -372,9 +372,9 @@ class Serialize::FieldBase : public Service * the object the field references gets deleted, this object * gets deleted too. */ - bool depends; + bool depends = false; - bool object = false; + bool is_object = false; FieldBase(Module *, const Anope::string &, const Anope::string &, bool); virtual ~FieldBase(); @@ -698,12 +698,12 @@ class Serialize::ObjectField : public CommonFieldBase<TypeImpl, T> public: ObjectField(TypeBase *t, const Anope::string &n, bool d = false) : CommonFieldBase<TypeImpl, T>(t, n, d) { - this->object = true; + this->is_object = true; } ObjectField(TypeBase *t, const Anope::string &n, T TypeImpl::*field, bool d = false) : CommonFieldBase<TypeImpl, T>(t, n, field, d) { - this->object = true; + this->is_object = true; } T GetField(TypeImpl *s) |