Remove broken copy and move constructor and assignment operatoos on vespalib::Lock and vespalib::Monitor.

Also repair broken usages of the same.

3 files changed, 4 insertions, 11 deletions

diff --git a/vdslib/src/vespa/vdslib/bucketdistribution.cpp b/vdslib/src/vespa/vdslib/bucketdistribution.cpp
index a8c39ad6577..15947d82fed 100644
--- a/vdslib/src/vespa/vdslib/bucketdistribution.cpp
+++ b/vdslib/src/vespa/vdslib/bucketdistribution.cpp
@@ -17,10 +17,7 @@ BucketDistribution::BucketDistribution(uint32_t numColumns, uint32_t numBucketBi
     setNumColumns(numColumns);
 }
 
-BucketDistribution::BucketDistribution(const BucketDistribution &) = default;
-BucketDistribution & BucketDistribution::operator = (const BucketDistribution &) = default;
-
-BucketDistribution::~BucketDistribution() {}
+BucketDistribution::~BucketDistribution() = default;
 
 void
 BucketDistribution::getBucketCount(uint32_t numColumns, uint32_t numBucketBits, std::vector<uint32_t> &ret)
@@ -47,9 +44,8 @@ BucketDistribution::getBucketMigrateCount(uint32_t numColumns, uint32_t numBucke
 void
 BucketDistribution::reset()
 {
-    for (std::vector<uint32_t>::iterator it = _bucketToColumn.begin();
-         it != _bucketToColumn.end(); ++it) {
-        *it = 0;
+    for (uint32_t & value : _bucketToColumn) {
+        value = 0;
     }
     _numColumns = 1;
 }
diff --git a/vdslib/src/vespa/vdslib/bucketdistribution.h b/vdslib/src/vespa/vdslib/bucketdistribution.h
index c9e584af7ef..5d06be53b49 100644
--- a/vdslib/src/vespa/vdslib/bucketdistribution.h
+++ b/vdslib/src/vespa/vdslib/bucketdistribution.h
@@ -21,10 +21,6 @@ public:
      * @param numBucketBits The number of bits to use for bucket id.
      */
     BucketDistribution(uint32_t numColumns, uint32_t numBucketBits);
-    BucketDistribution(const BucketDistribution &);
-    BucketDistribution & operator = (const BucketDistribution &);
-    BucketDistribution(BucketDistribution &&) = default;
-    BucketDistribution & operator = (BucketDistribution &&) = default;
     ~BucketDistribution();
 
     /**
diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.cpp b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
index 0a154f3dec1..474ed63e8c3 100644
--- a/vdslib/src/vespa/vdslib/distribution/distribution.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
@@ -14,6 +14,7 @@
 #include <list>
 #include <algorithm>
 #include <cmath>
+#include <cassert>
 
 #include <vespa/log/bufferedlogger.h>
 LOG_SETUP(".vdslib.distribution");