Deinline as compiler makes the best choices.

4 files changed, 24 insertions, 14 deletions

diff --git a/storageapi/src/vespa/storageapi/buckets/bucketinfo.cpp b/storageapi/src/vespa/storageapi/buckets/bucketinfo.cpp
index 1608909bdc5..07ba2773e91 100644
--- a/storageapi/src/vespa/storageapi/buckets/bucketinfo.cpp
+++ b/storageapi/src/vespa/storageapi/buckets/bucketinfo.cpp
@@ -14,8 +14,7 @@ BucketInfo::BucketInfo()
       _usedFileSize(1),
       _ready(false),
       _active(false)
-{
-}
+{}
 
 BucketInfo::BucketInfo(uint32_t checksum, uint32_t docCount,
                        uint32_t totDocSize)
@@ -27,8 +26,7 @@ BucketInfo::BucketInfo(uint32_t checksum, uint32_t docCount,
       _usedFileSize(totDocSize),
       _ready(false),
       _active(false)
-{
-}
+{}
 
 BucketInfo::BucketInfo(uint32_t checksum, uint32_t docCount,
                        uint32_t totDocSize, uint32_t metaCount,
@@ -41,8 +39,7 @@ BucketInfo::BucketInfo(uint32_t checksum, uint32_t docCount,
       _usedFileSize(usedFileSize),
       _ready(false),
       _active(false)
-{
-}
+{}
 
 BucketInfo::BucketInfo(uint32_t checksum, uint32_t docCount,
                        uint32_t totDocSize, uint32_t metaCount,
@@ -56,8 +53,7 @@ BucketInfo::BucketInfo(uint32_t checksum, uint32_t docCount,
       _usedFileSize(usedFileSize),
       _ready(ready),
       _active(active)
-{
-}
+{}
 
 BucketInfo::BucketInfo(uint32_t checksum, uint32_t docCount,
                        uint32_t totDocSize, uint32_t metaCount,
@@ -71,8 +67,11 @@ BucketInfo::BucketInfo(uint32_t checksum, uint32_t docCount,
       _usedFileSize(usedFileSize),
       _ready(ready),
       _active(active)
-{
-}
+{}
+
+BucketInfo::BucketInfo(const BucketInfo &) = default;
+BucketInfo & BucketInfo::operator = (const BucketInfo &) = default;
+BucketInfo::~BucketInfo() {}
 
 bool
 BucketInfo::operator==(const BucketInfo& info) const
diff --git a/storageapi/src/vespa/storageapi/buckets/bucketinfo.h b/storageapi/src/vespa/storageapi/buckets/bucketinfo.h
index 17ad75aa851..a807a1cf292 100644
--- a/storageapi/src/vespa/storageapi/buckets/bucketinfo.h
+++ b/storageapi/src/vespa/storageapi/buckets/bucketinfo.h
@@ -42,6 +42,9 @@ public:
     BucketInfo(uint32_t checksum, uint32_t docCount, uint32_t totDocSize,
                uint32_t metaCount, uint32_t usedFileSize,
                bool ready, bool active, Timestamp lastModified);
+    BucketInfo(const BucketInfo &);
+    BucketInfo & operator = (const BucketInfo &);
+    ~BucketInfo();
 
     Timestamp getLastModified() const { return _lastModified; }
     uint32_t getChecksum() const { return _checksum; }
diff --git a/storageapi/src/vespa/storageapi/messageapi/returncode.cpp b/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
index e2d10487431..1ee9ed54b6c 100644
--- a/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
+++ b/storageapi/src/vespa/storageapi/messageapi/returncode.cpp
@@ -9,14 +9,17 @@ namespace api {
 ReturnCode::ReturnCode()
     : _result(OK),
       _message()
-{
-}
+{}
+
+ReturnCode::ReturnCode(const ReturnCode &) = default;
+ReturnCode & ReturnCode::operator = (const ReturnCode &) = default;
+ReturnCode & ReturnCode::operator = (ReturnCode &&) = default;
+ReturnCode::~ReturnCode() {}
 
 ReturnCode::ReturnCode(Result result, const vespalib::stringref & msg)
     : _result(result),
       _message(msg)
-{
-}
+{}
 
 ReturnCode::ReturnCode(const document::DocumentTypeRepo &repo,
                        document::ByteBuffer& buffer)
diff --git a/storageapi/src/vespa/storageapi/messageapi/returncode.h b/storageapi/src/vespa/storageapi/messageapi/returncode.h
index 0aa87c64012..3bdcfc885de 100644
--- a/storageapi/src/vespa/storageapi/messageapi/returncode.h
+++ b/storageapi/src/vespa/storageapi/messageapi/returncode.h
@@ -75,6 +75,11 @@ public:
     explicit ReturnCode(Result result, const vespalib::stringref & msg = "");
     ReturnCode(const document::DocumentTypeRepo &repo,
                document::ByteBuffer& buffer);
+    ReturnCode(const ReturnCode &);
+    ReturnCode & operator = (const ReturnCode &);
+    ReturnCode(ReturnCode &&) = default;
+    ReturnCode & operator = (ReturnCode &&);
+    ~ReturnCode();
 
     ReturnCode* clone() const override { return new ReturnCode(*this); }