diff options
| author | Adam <Adam@anope.org> | 2014-05-28 12:11:45 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-05-28 12:22:39 -0400 |
| commit | f97e339314257fa37cfcab0c2289fb6812e32e85 (patch) | |
| tree | a1c9d352a771e0bb7d39d42178a7246d6f2c5434 /src/extensible.cpp | |
| parent | f29e1cf383529a1a29f02b0669d973f5ee0b7a66 (diff) | |
| parent | ba46b8e4abd8fef991732d5c52c858a229894a25 (diff) | |
Merge branch '2.0' into 2.1
Conflicts:
.travis.yml
src/config.cpp
src/version.sh
Diffstat (limited to 'src/extensible.cpp')
| -rw-r--r-- | src/extensible.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/extensible.cpp b/src/extensible.cpp index 552ad5d2b..37206f7c1 100644 --- a/src/extensible.cpp +++ b/src/extensible.cpp @@ -49,9 +49,6 @@ void Extensible::ExtensibleSerialize(const Extensible *e, const Serializable *s, void Extensible::ExtensibleUnserialize(Extensible *e, Serializable *s, Serialize::Data &data) { - while (!e->extension_items.empty()) - (*e->extension_items.begin())->Unset(e); - for (std::set<ExtensibleBase *>::iterator it = extensible_items.begin(); it != extensible_items.end(); ++it) { ExtensibleBase *eb = *it; |