From 98dbd312e170ce25eb3206c2a348f7aa799b42f7 Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@gmail.com>
Date: Tue, 21 Mar 2017 19:53:40 +0100
Subject: Revert "Change interface to accomodate removing linkedptr later on."

---
 staging_vespalib/src/vespa/vespalib/objects/identifiable.hpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'staging_vespalib')

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;
     }
-- 
cgit v1.2.3