Merge pull request #12315 from vespa-engine/balder/follow-intellij-advise

Follow clion advise

5 files changed, 20 insertions, 28 deletions

diff --git a/vespalib/src/vespa/vespalib/data/slime/object_value.h b/vespalib/src/vespa/vespalib/data/slime/object_value.h
index 377bf5bd37f..651f3a156d2 100644
--- a/vespalib/src/vespa/vespalib/data/slime/object_value.h
+++ b/vespalib/src/vespa/vespalib/data/slime/object_value.h
@@ -12,8 +12,7 @@
 #include <vespa/vespalib/stllike/vector_map.h>
 #include <vespa/vespalib/util/stash.h>
 
-namespace vespalib {
-namespace slime {
+namespace vespalib::slime {
 
 /**
  * Class representing a collection of unordered values that can be
@@ -32,7 +31,7 @@ private:
 
     Cursor &setIfUnset(SymbolInserter &symbol, const ValueFactory &input) {
         Value *&pos = _fields[symbol.insert()];
-        if (pos != 0) {
+        if (pos != nullptr) {
             return *NixValue::invalid();
         }
         pos = input.create(_stash);
@@ -40,7 +39,7 @@ private:
     }
 
     Value *lookup(const SymbolLookup &symbol) const {
-        SymbolValueMap::const_iterator pos = _fields.find(symbol.lookup());
+        auto pos = _fields.find(symbol.lookup());
         if (pos == _fields.end()) {
             return NixValue::invalid();
         }
@@ -81,9 +80,7 @@ public:
     Cursor &setObject(Memory name) override;
     Symbol resolve(Memory symbol_name) override;
 
-    ~ObjectValue() { }
+    ~ObjectValue() override = default;
 };
 
-} // namespace vespalib::slime
-} // namespace vespalib
-
+}
diff --git a/vespalib/src/vespa/vespalib/geo/zcurve.cpp b/vespalib/src/vespa/vespalib/geo/zcurve.cpp
index b2dc02759dc..00ce7ee18c6 100644
--- a/vespalib/src/vespa/vespalib/geo/zcurve.cpp
+++ b/vespalib/src/vespa/vespalib/geo/zcurve.cpp
@@ -4,8 +4,7 @@
 #include <vespa/vespalib/util/priority_queue.h>
 #include <vespa/vespalib/util/fiddle.h>
 
-namespace vespalib {
-namespace geo {
+namespace vespalib::geo {
 
 namespace {
 
@@ -182,4 +181,3 @@ ZCurve::decodeSlow(int64_t enc, int32_t *xp, int32_t *yp)
 }
 
 }
-}
diff --git a/vespalib/src/vespa/vespalib/geo/zcurve.h b/vespalib/src/vespa/vespalib/geo/zcurve.h
index 2a05c4c7744..bd76b78ea23 100644
--- a/vespalib/src/vespa/vespalib/geo/zcurve.h
+++ b/vespalib/src/vespa/vespalib/geo/zcurve.h
@@ -6,8 +6,7 @@
 #include <cassert>
 #include <vector>
 
-namespace vespalib {
-namespace geo {
+namespace vespalib::geo {
 
 /**
  * @brief Utility methods for a Z-curve (Morton-order) encoder and decoder.
@@ -31,7 +30,7 @@ public:
     public:
         BoundingBox(int32_t minx, int32_t maxx, int32_t miny, int32_t maxy);
 
-        ~BoundingBox() { }
+        ~BoundingBox() = default;
 
         int64_t getzMinx() const { return _zMinx; } 
         int64_t getzMaxx() const { return _zMaxx; } 
@@ -221,5 +220,3 @@ public:
 };
 
 }
-}
-
diff --git a/vespalib/src/vespa/vespalib/util/stash.cpp b/vespalib/src/vespa/vespalib/util/stash.cpp
index 18ed0e56e27..836654c2fb2 100644
--- a/vespalib/src/vespa/vespalib/util/stash.cpp
+++ b/vespalib/src/vespa/vespalib/util/stash.cpp
@@ -59,14 +59,14 @@ Stash::do_alloc(size_t size)
     }
 }
 
-Stash::Stash(size_t chunk_size)
+Stash::Stash(size_t chunk_size) noexcept
     : _chunks(nullptr),
       _cleanup(nullptr),
       _chunk_size(std::max(size_t(4096), chunk_size))
 {
 }
 
-Stash::Stash(Stash &&rhs)
+Stash::Stash(Stash &&rhs) noexcept
     : _chunks(rhs._chunks),
       _cleanup(rhs._cleanup),
       _chunk_size(rhs._chunk_size)
@@ -76,7 +76,7 @@ Stash::Stash(Stash &&rhs)
 }
 
 Stash &
-Stash::operator=(Stash &&rhs)
+Stash::operator=(Stash &&rhs) noexcept
 {
     stash::run_cleanup(_cleanup);
     stash::free_chunks(_chunks);
diff --git a/vespalib/src/vespa/vespalib/util/stash.h b/vespalib/src/vespa/vespalib/util/stash.h
index aa1441aa0bb..c5e8631ca9e 100644
--- a/vespalib/src/vespa/vespalib/util/stash.h
+++ b/vespalib/src/vespa/vespalib/util/stash.h
@@ -14,19 +14,19 @@ struct Cleanup {
     explicit Cleanup(Cleanup *next_in) noexcept : next(next_in) {}
     virtual void cleanup() = 0;
 protected:
-    virtual ~Cleanup() {}
+    virtual ~Cleanup() = default;
 };
 
 // used as header for memory allocated outside the stash
 struct DeleteMemory : public Cleanup {
     explicit DeleteMemory(Cleanup *next_in) noexcept : Cleanup(next_in) {}
-    virtual void cleanup() override { free((void*)this); }
+    void cleanup() override { free((void*)this); }
 };
 
 // used as prefix for objects to be destructed
 template<typename T> struct DestructObject : public Cleanup {
     explicit DestructObject(Cleanup *next_in) noexcept : Cleanup(next_in) {}
-    virtual void cleanup() override { reinterpret_cast<T*>(this + 1)->~T(); }
+    void cleanup() override { reinterpret_cast<T*>(this + 1)->~T(); }
 };
 
 // used as prefix for arrays to be destructed
@@ -34,7 +34,7 @@ template<typename T> struct DestructArray : public Cleanup {
     size_t size;
     explicit DestructArray(Cleanup *next_in, size_t size_in) noexcept
         : Cleanup(next_in), size(size_in) {}
-    virtual void cleanup() override {
+    void cleanup() override {
         T *array = reinterpret_cast<T*>(this + 1);
         for (size_t i = size; i-- > 0;) {
             array[i].~T();
@@ -46,7 +46,7 @@ struct Chunk {
     Chunk  *next;
     size_t  used;
     Chunk(const Chunk &) = delete;
-    Chunk(Chunk *next_in) : next(next_in), used(sizeof(Chunk)) {}
+    explicit Chunk(Chunk *next_in) : next(next_in), used(sizeof(Chunk)) {}
     void clear() { used = sizeof(Chunk); }
     char *alloc(size_t size, size_t chunk_size) {
         size_t aligned_size = ((size + (sizeof(char *) - 1))
@@ -124,14 +124,14 @@ public:
     };
 
     typedef std::unique_ptr<Stash> UP;
-    explicit Stash(size_t chunk_size);
-    Stash() : Stash(4096) {}
-    Stash(Stash &&rhs);
+    explicit Stash(size_t chunk_size) noexcept ;
+    Stash() noexcept : Stash(4096) {}
+    Stash(Stash &&rhs) noexcept;
     Stash(const Stash &) = delete;
     Stash & operator = (const Stash &) = delete;
     ~Stash();
 
-    Stash &operator=(Stash &&rhs);
+    Stash &operator=(Stash &&rhs) noexcept;
 
     void clear();