aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-06-12 14:32:47 +0200
committerHenning Baldersheim <balder@oath.com>2018-06-12 14:53:28 +0200
commit90d9c4f6be7d09cb6a7f5570f10d86404cbfc15a (patch)
tree46d675f8eef5c41f9df8e8749da55be81ee8fd27 /searchcore
parent7c4f18824d24d7c6124fbdb0ced7587bc6e19caf (diff)
Last style changes before lazy documentupdate PR.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp14
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp4
2 files changed, 7 insertions, 11 deletions
diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
index 681d3543ee1..9a9d896f2b9 100644
--- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
@@ -100,14 +100,12 @@ makeDocTypeRepo()
{
DocumenttypesConfigBuilderHelper builder;
builder.document(doc_type_id, type_name,
- Struct(header_name), Struct(body_name).
- addField("string", DataType::T_STRING).
- addField("struct", Struct("pair").
- addField("x", DataType::T_STRING).
- addField("y", DataType::T_STRING)).
- addField("map", Map(DataType::T_STRING,
- DataType::T_STRING)));
- return std::unique_ptr<const DocumentTypeRepo>(new DocumentTypeRepo(builder.config()));
+ Struct(header_name),
+ Struct(body_name)
+ .addField("string", DataType::T_STRING)
+ .addField("struct", Struct("pair").addField("x", DataType::T_STRING).addField("y", DataType::T_STRING))
+ .addField("map", Map(DataType::T_STRING, DataType::T_STRING)));
+ return std::make_unique<const DocumentTypeRepo>(builder.config());
}
diff --git a/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp b/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
index 6b3ee548ad5..cdb42906fc2 100644
--- a/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
@@ -106,9 +106,7 @@ ReplayPacketDispatcher::replayEntry(const Packet::Entry &entry)
}
-ReplayPacketDispatcher::~ReplayPacketDispatcher()
-{
-}
+ReplayPacketDispatcher::~ReplayPacketDispatcher() = default;
void