summaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-03-21 16:07:00 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-03-21 16:07:00 +0100
commit8ef5b148d0c18d5c2b057d39ee9532edffc1ace3 (patch)
treef1aa4ffa6d4fec5f8209e2ced3a849bc6c027f47 /staging_vespalib
parent24ff4f5ae0cdbc4d53221c8e6b916ef65437b1ce (diff)
Change interface to accomodate removing linkedptr later on.
Diffstat (limited to 'staging_vespalib')
-rw-r--r--staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp b/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
index 617d631328b..283f2ca038e 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
+++ b/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
@@ -73,6 +73,8 @@ public:
is.get(Identifiable::hasObjectField, hasObject);
if (hasObject) {
this->reset(static_cast<T *>(Identifiable::create(is).release()));
+ } else {
+ this->reset();
}
return is;
}
@@ -110,6 +112,8 @@ public:
is.get(Identifiable::hasObjectField, hasObject);
if (hasObject) {
reset(static_cast<T *>(Identifiable::create(is).release()));
+ } else {
+ this->reset();
}
return is;
}
@@ -147,6 +151,8 @@ public:
is.get(Identifiable::hasObjectField, hasObject);
if (hasObject) {
this->reset(static_cast<T *>(Identifiable::create(is).release()));
+ } else {
+ this->reset();
}
return is;
}