[avro] branch master updated: Fix for move constructor errors and warnings (#412)

[thiru]

This is an automated email from the ASF dual-hosted git repository.

thiru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/master by this push:
     new 29e1d66  Fix for move constructor errors and warnings (#412)
29e1d66 is described below

commit 29e1d662bafc66499e198a6af9b0920aa79695e5
Author: Thiruvalluvan M G <th...@apache.org>
AuthorDate: Sun Dec 23 17:23:27 2018 +0530

    Fix for move constructor errors and warnings (#412)
---
 lang/c++/api/DataFile.hh         | 6 +++---
 lang/c++/impl/DataFile.cc        | 6 +++---
 lang/c++/test/AvrogencppTests.cc | 2 +-
 lang/c++/test/unittest.cc        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lang/c++/api/DataFile.hh b/lang/c++/api/DataFile.hh
index eb8ad2c..1a95296 100644
--- a/lang/c++/api/DataFile.hh
+++ b/lang/c++/api/DataFile.hh
@@ -150,7 +150,7 @@ public:
 
     DataFileWriter(std::unique_ptr<OutputStream> outputStream, const 
ValidSchema& schema,
         size_t syncInterval = 16 * 1024, Codec codec = NULL_CODEC) :
-        base_(new DataFileWriterBase(outputStream, schema, syncInterval, 
codec)) { }
+        base_(new DataFileWriterBase(std::move(outputStream), schema, 
syncInterval, codec)) { }
 
     /**
      * Writes the given piece of data into the file.
@@ -305,7 +305,7 @@ public:
     }
 
     DataFileReader(std::unique_ptr<InputStream> inputStream, const 
ValidSchema& readerSchema) :
-        base_(new DataFileReaderBase(inputStream)) {
+        base_(new DataFileReaderBase(std::move(inputStream))) {
         base_->init(readerSchema);
     }
 
@@ -319,7 +319,7 @@ public:
     }
 
     DataFileReader(std::unique_ptr<InputStream> inputStream) :
-        base_(new DataFileReaderBase(inputStream)) {
+        base_(new DataFileReaderBase(std::move(inputStream))) {
         base_->init();
     }
 
diff --git a/lang/c++/impl/DataFile.cc b/lang/c++/impl/DataFile.cc
index d46a765..ad645ec 100644
--- a/lang/c++/impl/DataFile.cc
+++ b/lang/c++/impl/DataFile.cc
@@ -71,7 +71,7 @@ DataFileWriterBase::DataFileWriterBase(const char* filename, 
const ValidSchema&
     syncInterval_(syncInterval),
     codec_(codec),
     stream_(fileOutputStream(filename)),
-    buffer_(std::move(memoryOutputStream())),
+    buffer_(memoryOutputStream()),
     sync_(makeSync()),
     objectCount_(0)
 {
@@ -86,7 +86,7 @@ 
DataFileWriterBase::DataFileWriterBase(std::unique_ptr<OutputStream> outputStrea
     syncInterval_(syncInterval),
     codec_(codec),
     stream_(std::move(outputStream)),
-    buffer_(std::move(memoryOutputStream())),
+    buffer_(memoryOutputStream()),
     sync_(makeSync()),
     objectCount_(0)
 {
@@ -214,7 +214,7 @@ void DataFileWriterBase::sync()
     encoderPtr_->flush();
 
 
-    buffer_ = std::move(memoryOutputStream());
+    buffer_ = memoryOutputStream();
     encoderPtr_->init(*buffer_);
     objectCount_ = 0;
 }
diff --git a/lang/c++/test/AvrogencppTests.cc b/lang/c++/test/AvrogencppTests.cc
index dfe0036..4e3fa32 100644
--- a/lang/c++/test/AvrogencppTests.cc
+++ b/lang/c++/test/AvrogencppTests.cc
@@ -209,7 +209,7 @@ void testResolution()
     s_r.toJson(oss);
     ValidSchema s_rs = avro::compileJsonSchemaFromString(oss.str());
 
-    std::unique_ptr<InputStream> is2 = std::move(memoryInputStream(*os));
+    std::unique_ptr<InputStream> is2 = memoryInputStream(*os);
     dd->init(*is2);
     rd = resolvingDecoder(s_w, s_rs, dd);
     testgen_r::RootRecord t4;
diff --git a/lang/c++/test/unittest.cc b/lang/c++/test/unittest.cc
index ff0a7d8..9944a82 100644
--- a/lang/c++/test/unittest.cc
+++ b/lang/c++/test/unittest.cc
@@ -742,10 +742,10 @@ struct TestNested
     // Tests for encode + decode
     void runEncodeDecode(Encoder &e, Decoder &d, void (*encode_fn)(Encoder &))
     {
-        std::unique_ptr<OutputStream> out = std::move(memoryOutputStream());
+        std::unique_ptr<OutputStream> out = memoryOutputStream();
         e.init(*out);
         encode_fn(e);
-        std::unique_ptr<InputStream> in = std::move(memoryInputStream(*out));
+        std::unique_ptr<InputStream> in = memoryInputStream(*out);
         d.init(*in);
         runDecoder(d);
     }