Simplify as functionality is abandoned.

2 files changed, 6 insertions, 6 deletions

diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp
index c4751af5adb..861216fd53c 100644
--- a/searchlib/src/tests/transactionlog/translogclient_test.cpp
+++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp
@@ -63,14 +63,14 @@ class CallBackTest : public TransLogClient::Visitor::Callback
 private:
     virtual RPC::Result receive(const Packet & packet) override;
     virtual void eof()    override { _eof = true; }
-    typedef std::map<SerialNum, ByteBuffer> PacketMap;
+    typedef std::map<SerialNum, std::unique_ptr<ByteBuffer>> PacketMap;
     PacketMap _packetMap;
 public:
     CallBackTest() : _eof(false) { }
     size_t size() const { return _packetMap.size(); }
     bool hasSerial(SerialNum n) const { return (_packetMap.find(n) != _packetMap.end()); }
     void clear() {  _eof = false; _packetMap.clear(); }
-    const ByteBuffer & packet(SerialNum n) { return (_packetMap.find(n)->second); }
+    const ByteBuffer & packet(SerialNum n) { return *(_packetMap.find(n)->second); }
 
     bool      _eof;
 };
@@ -83,7 +83,7 @@ RPC::Result CallBackTest::receive(const Packet & p)
         Packet::Entry e;
         e.deserialize(h);
         LOG(info,"CallBackTest::receive (%zu, %zu, %zu)(%s)", h.rp(), h.size(), h.capacity(), myhex(e.data().c_str(), e.data().size()).c_str());
-        _packetMap[e.serial()] = ByteBuffer(e.data().c_str(), e.data().size());
+        _packetMap[e.serial()] = std::make_unique<ByteBuffer>(e.data().c_str(), e.data().size());
     }
     return RPC::OK;
 }
diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp
index a0e4b4884a9..36ce43cc52a 100644
--- a/searchlib/src/tests/transactionlogstress/translogstress.cpp
+++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp
@@ -80,8 +80,8 @@ private:
 
 public:
     EntryGenerator(long baseSeed, const BufferGenerator & bufferGenerator) :
-        _rnd(), _baseSeed(baseSeed), _bufferGenerator(bufferGenerator), _buffers(NULL),
-        _lastGeneratedBuffer() {}
+        _rnd(), _baseSeed(baseSeed), _bufferGenerator(bufferGenerator), _buffers(nullptr),
+        _lastGeneratedBuffer(0) {}
     EntryGenerator(const EntryGenerator & rhs) :
         _rnd(), _baseSeed(rhs._baseSeed), _bufferGenerator(rhs._bufferGenerator),
         _buffers(rhs._buffers), _lastGeneratedBuffer(rhs._lastGeneratedBuffer) {}
@@ -122,7 +122,7 @@ EntryGenerator::getRandomEntry(SerialNum num)
         return Packet::Entry(num, 1024, ConstBufferRef(buffer.getBuffer(), buffer.getLength()));
     } else {
         _bufferGenerator.setSeed(_baseSeed + num);
-        _lastGeneratedBuffer = _bufferGenerator.getRandomBuffer();
+        _lastGeneratedBuffer = std::move(_bufferGenerator.getRandomBuffer());
         return Packet::Entry(num, 1024, ConstBufferRef(_lastGeneratedBuffer.getBuffer(), _lastGeneratedBuffer.getLength()));
     }
 }