aboutsummaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2017-03-21 19:53:40 +0100
committerGitHub <noreply@github.com>2017-03-21 19:53:40 +0100
commit98dbd312e170ce25eb3206c2a348f7aa799b42f7 (patch)
tree0ac01beb58b53c0b1630a2415805361d9f676c37 /staging_vespalib
parente36267c66428e0327371a6970fb71ad0a5a1e877 (diff)
Revert "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, 0 insertions, 6 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp b/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
index 283f2ca038e..617d631328b 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
+++ b/staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp
@@ -73,8 +73,6 @@ public:
is.get(Identifiable::hasObjectField, hasObject);
if (hasObject) {
this->reset(static_cast<T *>(Identifiable::create(is).release()));
- } else {
- this->reset();
}
return is;
}
@@ -112,8 +110,6 @@ public:
is.get(Identifiable::hasObjectField, hasObject);
if (hasObject) {
reset(static_cast<T *>(Identifiable::create(is).release()));
- } else {
- this->reset();
}
return is;
}
@@ -151,8 +147,6 @@ public:
is.get(Identifiable::hasObjectField, hasObject);
if (hasObject) {
this->reset(static_cast<T *>(Identifiable::create(is).release()));
- } else {
- this->reset();
}
return is;
}