Style changes.

2 files changed, 13 insertions, 16 deletions

diff --git a/searchlib/src/vespa/searchlib/datastore/buffer_type.cpp b/searchlib/src/vespa/searchlib/datastore/buffer_type.cpp
index 6e77b267818..1a968942c6d 100644
--- a/searchlib/src/vespa/searchlib/datastore/buffer_type.cpp
+++ b/searchlib/src/vespa/searchlib/datastore/buffer_type.cpp
@@ -7,10 +7,12 @@
 namespace search::datastore {
 
 void
-BufferTypeBase::CleanContext::extraBytesCleaned(uint64_t value) {
+BufferTypeBase::CleanContext::extraBytesCleaned(uint64_t value)
+{
     assert(_extraBytes >= value);
     _extraBytes -= value;
 }
+
 BufferTypeBase::BufferTypeBase(uint32_t clusterSize,
                                uint32_t minClusters,
                                uint32_t maxClusters,
@@ -24,15 +26,15 @@ BufferTypeBase::BufferTypeBase(uint32_t clusterSize,
       _activeUsedElems(0),
       _holdUsedElems(0),
       _lastUsedElems(nullptr)
-{ }
-
+{
+}
 
 BufferTypeBase::BufferTypeBase(uint32_t clusterSize,
                                uint32_t minClusters,
                                uint32_t maxClusters)
     : BufferTypeBase(clusterSize, minClusters, maxClusters, 0u)
-{ }
-
+{
+}
 
 BufferTypeBase::~BufferTypeBase()
 {
@@ -52,13 +54,12 @@ BufferTypeBase::getReservedElements(uint32_t bufferId) const
 void
 BufferTypeBase::flushLastUsed()
 {
-    if (_lastUsedElems != NULL) {
+    if (_lastUsedElems != nullptr) {
         _activeUsedElems += *_lastUsedElems;
-        _lastUsedElems = NULL;
+        _lastUsedElems = nullptr;
     }
 }
 
-
 void
 BufferTypeBase::onActive(uint32_t bufferId, size_t *usedElems, size_t &deadElems, void *buffer)
 {
@@ -73,12 +74,12 @@ BufferTypeBase::onActive(uint32_t bufferId, size_t *usedElems, size_t &deadElems
     }
 }
 
-
 void
 BufferTypeBase::onHold(const size_t *usedElems)
 {
-    if (usedElems == _lastUsedElems)
+    if (usedElems == _lastUsedElems) {
         flushLastUsed();
+    }
     --_activeBuffers;
     ++_holdBuffers;
     assert(_activeUsedElems >= *usedElems);
@@ -86,7 +87,6 @@ BufferTypeBase::onHold(const size_t *usedElems)
     _holdUsedElems += *usedElems;
 }
 
-
 void
 BufferTypeBase::onFree(size_t usedElems)
 {
@@ -101,14 +101,14 @@ BufferTypeBase::clampMaxClusters(uint32_t maxClusters)
     _maxClusters = std::min(_maxClusters, maxClusters);
     _minClusters = std::min(_minClusters, _maxClusters);
     _numClustersForNewBuffer = std::min(_numClustersForNewBuffer, _maxClusters);
-};
+}
 
 size_t
 BufferTypeBase::calcClustersToAlloc(uint32_t bufferId, size_t sizeNeeded, bool resizing) const
 {
     size_t reservedElements = getReservedElements(bufferId);
     size_t usedElems = _activeUsedElems;
-    if (_lastUsedElems != NULL) {
+    if (_lastUsedElems != nullptr) {
         usedElems += *_lastUsedElems;
     }
     assert((usedElems % _clusterSize) == 0);
diff --git a/searchlib/src/vespa/searchlib/datastore/buffer_type.h b/searchlib/src/vespa/searchlib/datastore/buffer_type.h
index 2b7ae4f0597..b9bedce34f3 100644
--- a/searchlib/src/vespa/searchlib/datastore/buffer_type.h
+++ b/searchlib/src/vespa/searchlib/datastore/buffer_type.h
@@ -118,7 +118,6 @@ BufferType<EntryType>::destroyElements(void *buffer, size_t numElements)
     }
 }
 
-
 template <typename EntryType>
 void
 BufferType<EntryType>::fallbackCopy(void *newBuffer,
@@ -134,7 +133,6 @@ BufferType<EntryType>::fallbackCopy(void *newBuffer,
     }
 }
 
-
 template <typename EntryType>
 void
 BufferType<EntryType>::initializeReservedElements(void *buffer, size_t reservedElems)
@@ -146,7 +144,6 @@ BufferType<EntryType>::initializeReservedElements(void *buffer, size_t reservedE
     }
 }
 
-
 template <typename EntryType>
 void
 BufferType<EntryType>::cleanHold(void *buffer, uint64_t offset, uint64_t len, CleanContext)