[glom] CsvParser: Use unique_ptr<> for buffer instead of shared_ptr<>.



commit 05d39a2d5c59c2834d501c9bcc56e1a5c4b4d52f
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Feb 9 15:21:40 2016 +0100

    CsvParser: Use unique_ptr<> for buffer instead of shared_ptr<>.
    
    Because nothing shares it.

 glom/import_csv/csv_parser.cc |    4 ++--
 glom/import_csv/csv_parser.h  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/glom/import_csv/csv_parser.cc b/glom/import_csv/csv_parser.cc
index 1aaff7a..d121bfe 100644
--- a/glom/import_csv/csv_parser.cc
+++ b/glom/import_csv/csv_parser.cc
@@ -508,7 +508,7 @@ void CsvParser::on_file_read(const Glib::RefPtr<Gio::AsyncResult>& result, const
   {
     m_stream = source->read_finish(result);
 
-    m_buffer.reset(new Buffer);
+    m_buffer = std::make_unique<Buffer>();
     m_stream->read_async(m_buffer->buf, sizeof(m_buffer->buf), sigc::mem_fun(*this, 
&CsvParser::on_buffer_read));
   }
   catch(const Glib::Exception& ex)
@@ -524,7 +524,7 @@ void CsvParser::copy_buffer_and_continue_reading(gssize size)
   {
     m_raw.insert(m_raw.end(), m_buffer->buf, m_buffer->buf + size);
 
-    m_buffer.reset(new Buffer);
+    m_buffer = std::make_unique<Buffer>();
     m_stream->read_async(m_buffer->buf, sizeof(m_buffer->buf), sigc::mem_fun(*this, 
&CsvParser::on_buffer_read));
   }
   else // When size == 0 we finished reading.
diff --git a/glom/import_csv/csv_parser.h b/glom/import_csv/csv_parser.h
index 41f5141..99e7881 100644
--- a/glom/import_csv/csv_parser.h
+++ b/glom/import_csv/csv_parser.h
@@ -212,7 +212,7 @@ private:
   {
     char buf[1024];
   };
-  std::shared_ptr<Buffer> m_buffer;
+  std::unique_ptr<Buffer> m_buffer;
 };
 
 } //namespace Glom


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]