diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-14 09:30:04 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-14 09:30:04 +0000 |
| commit | 6184c299103e4967c4413939b2d50249a3c09258 (patch) | |
| tree | 6d924e4ae77def30b47656813b80dbcf6cb1c27f /storage/src/tests/visiting/visitortest.cpp | |
| parent | 8039539c2717ef46c58060533eab5019d1b2a72e (diff) | |
Use std::mutex/std::condition instead of vespalib::Monitor.
Diffstat (limited to 'storage/src/tests/visiting/visitortest.cpp')
| -rw-r--r-- | storage/src/tests/visiting/visitortest.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/storage/src/tests/visiting/visitortest.cpp b/storage/src/tests/visiting/visitortest.cpp index ee6b8fa3d38..72668564345 100644 --- a/storage/src/tests/visiting/visitortest.cpp +++ b/storage/src/tests/visiting/visitortest.cpp @@ -284,7 +284,7 @@ VisitorTest::getMessagesAndReply( session.waitForMessages(1); mbus::Reply::UP reply; { - vespalib::MonitorGuard guard(session.getMonitor()); + std::lock_guard guard(session.getMonitor()); ASSERT_FALSE(session.sentMessages.empty()); std::unique_ptr<documentapi::DocumentMessage> msg(std::move(session.sentMessages.front())); session.sentMessages.pop_front(); @@ -292,12 +292,10 @@ VisitorTest::getMessagesAndReply( switch (msg->getType()) { case documentapi::DocumentProtocol::MESSAGE_PUTDOCUMENT: - docs.push_back( - static_cast<documentapi::PutDocumentMessage&>(*msg).getDocumentSP()); + docs.push_back(static_cast<documentapi::PutDocumentMessage&>(*msg).getDocumentSP()); break; case documentapi::DocumentProtocol::MESSAGE_REMOVEDOCUMENT: - docIds.push_back( - static_cast<documentapi::RemoveDocumentMessage&>(*msg).getDocumentId()); + docIds.push_back(static_cast<documentapi::RemoveDocumentMessage&>(*msg).getDocumentId()); break; case documentapi::DocumentProtocol::MESSAGE_VISITORINFO: infoMessages.push_back(static_cast<documentapi::VisitorInfoMessage&>(*msg).getErrorMessage()); @@ -309,7 +307,7 @@ VisitorTest::getMessagesAndReply( reply = msg->createReply(); reply->swapState(*msg); - reply->setMessage(mbus::Message::UP(msg.release())); + reply->setMessage(std::move(msg)); if (result != api::ReturnCode::OK) { reply->addError(mbus::Error(result, "Generic error")); |