From d1d2d5d79bd235a91982ef0c018684e05e0e0ed0 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 15 May 2020 21:38:51 +0000
Subject: Since there might be a large variation in number of entries, let us
 not take a fixed cost up front.

---
 .../src/vespa/searchcommon/attribute/attributecontent.h     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'searchcommon/src')

diff --git a/searchcommon/src/vespa/searchcommon/attribute/attributecontent.h b/searchcommon/src/vespa/searchcommon/attribute/attributecontent.h
index 72ce1754d71..67b269139d3 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/attributecontent.h
+++ b/searchcommon/src/vespa/searchcommon/attribute/attributecontent.h
@@ -33,7 +33,7 @@ public:
      * Creates a new object with an initial capacity of 16 without dynamic allocation.
      **/
     AttributeContent() :
-        _dynamicBuf(NULL),
+        _dynamicBuf(nullptr),
         _size(0),
         _capacity(16)
     {
@@ -42,7 +42,7 @@ public:
      * Destructs the object.
      **/
     ~AttributeContent() {
-        if (_dynamicBuf != NULL) {
+        if (_dynamicBuf != nullptr) {
             delete [] _dynamicBuf;
         }
     }
@@ -53,7 +53,7 @@ public:
      * @return iterator
      **/
     const T * begin() const {
-        if (_dynamicBuf != NULL) {
+        if (_dynamicBuf != nullptr) {
             return _dynamicBuf;
         }
         return _staticBuf;
@@ -102,7 +102,7 @@ public:
      * @return read/write pointer.
      **/
     T * data() {
-        if (_dynamicBuf != NULL) {
+        if (_dynamicBuf != nullptr) {
             return _dynamicBuf;
         }
         return _staticBuf;
@@ -126,7 +126,7 @@ public:
      **/
     void allocate(uint32_t n) {
         if (n > _capacity) {
-            if (_dynamicBuf != NULL) {
+            if (_dynamicBuf != nullptr) {
                 delete [] _dynamicBuf;
             }
             _dynamicBuf = new T[n];
@@ -141,8 +141,7 @@ public:
      * @param attribute the attribute vector
      * @param docId the docId
      **/
-    void fill(const search::attribute::IAttributeVector & attribute,
-              search::attribute::IAttributeVector::DocId docId)
+    void fill(const IAttributeVector & attribute, IAttributeVector::DocId docId)
     {
         uint32_t count = attribute.get(docId, data(), capacity());
         while (count > capacity()) {
-- 
cgit v1.2.3