- Reorder members for compactness.

- Avoid needing the definition of Error everywhere.
- use std::make_xxx and other c++11 constructs.

2 files changed, 4 insertions, 8 deletions

diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp
index b6d0d297a69..ee577881d82 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.cpp
@@ -5,8 +5,7 @@
 #include "storagecommand.h"
 #include "serializationhelper.h"
 
-namespace storage {
-namespace mbusprot {
+namespace storage::mbusprot {
 
 using documentapi::TestAndSetCondition;
 
@@ -62,5 +61,4 @@ void ProtocolSerialization5_2::encodeTasCondition(GBBuf & buf, const api::Storag
     buf.putString(cmd.getCondition().getSelection());
 }
 
-} // mbusprot
-} // storage
+}
diff --git a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.h b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.h
index 42e9c17e192..f6f9443248c 100644
--- a/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.h
+++ b/storageapi/src/vespa/storageapi/mbusprot/protocolserialization5_2.h
@@ -7,8 +7,7 @@
 #include <vespa/vespalib/util/growablebytebuffer.h>
 #include <vespa/storageapi/message/persistence.h>
 
-namespace storage {
-namespace mbusprot {
+namespace storage::mbusprot {
 
 class ProtocolSerialization5_2 : public ProtocolSerialization5_1
 {
@@ -31,5 +30,4 @@ protected:
     static void encodeTasCondition(GBBuf & buf, const api::StorageCommand & cmd);
 };
 
-} // mbusprot
-} // storage
+}