drop broken move constructor in zip_sink

Author: staticlibs

CMakeLists.txt

@@ -15,7 +15,7 @@
 cmake_minimum_required ( VERSION 2.8.12 )
 
 project ( staticlib_compress CXX )
-set ( ${PROJECT_NAME}_STATICLIB_VERSION 1.2.1 )
+set ( ${PROJECT_NAME}_STATICLIB_VERSION 1.2.2 )
 set ( ${PROJECT_NAME}_DESCRIPTION "Staticlibs Compress library" )
 set ( ${PROJECT_NAME}_URL https://github.com/staticlibs/staticlib_compress )
 include ( ${CMAKE_CURRENT_LIST_DIR}/resources/macros.cmake )

README.md

@@ -26,6 +26,11 @@ This project is released under the [Apache License 2.0](http://www.apache.org/li
 Changelog
 ---------
 
+**2018-05-16**
+
+ * version 1.2.2
+ * drop broken move constructor in `zip_sink`
+
 **2018-02-22**
 
  * version 1.2.1

include/staticlib/compress/zip_sink.hpp

@@ -239,35 +239,6 @@ class zip_sink {
      */
     zip_sink& operator=(const zip_sink&) = delete;
 
-    /**
-     * Move constructor
-     * 
-     * @param other other instance
-     */
-    zip_sink(zip_sink&& other) :
-    sink(std::move(other.sink)),
-    headers(std::move(other.headers)),
-    cd_written(other.cd_written),
-    entry_counter(std::move(other.entry_counter)),
-    entry_deflater(std::move(other.entry_deflater)),
-    entry_crc(other.entry_crc) { }
-
-    /**
-     * Move assignment operator
-     * 
-     * @param other other instance
-     * @return this instance
-     */
-    zip_sink& operator=(zip_sink&& other) {
-        sink = std::move(other.sink);
-        headers = std::move(other.headers);
-        cd_written = other.cd_written;
-        entry_counter = std::move(other.entry_counter);
-        entry_deflater = std::move(other.entry_deflater);
-        entry_crc = other.entry_crc;
-        return *this;
-    }
-
     /**
      * Write implementation
      * 
@@ -354,8 +325,9 @@ class zip_sink {
  */
 template <typename Sink,
 class = typename std::enable_if<!std::is_lvalue_reference<Sink>::value>::type>
-zip_sink<Sink> make_zip_sink(Sink&& sink) {
-    return zip_sink<Sink>(std::move(sink));
+sl::io::unique_sink<zip_sink<Sink>> make_zip_sink(Sink&& sink) {
+    auto ptr = new zip_sink<Sink>(std::move(sink));
+    return sl::io::make_unique_sink(ptr);
 }
 
 /**
@@ -366,9 +338,10 @@ zip_sink<Sink> make_zip_sink(Sink&& sink) {
  * @return zip sink
  */
 template <typename Sink>
-zip_sink<sl::io::reference_sink<Sink>> make_zip_sink(Sink& sink) {
-    return zip_sink<sl::io::reference_sink<Sink>> (
+sl::io::unique_sink<zip_sink<sl::io::reference_sink<Sink>>> make_zip_sink(Sink& sink) {
+    auto ptr = new zip_sink<sl::io::reference_sink<Sink>> (
             sl::io::make_reference_sink(sink));
+    return sl::io::make_unique_sink(ptr);
 }
 
 } // namespace

test/zip_sink_test.cpp

@@ -32,9 +32,9 @@
 
 void test_store() {
     auto sink = sl::compress::make_zip_sink(sl::tinydir::file_sink("test.zip"));
-    sink.add_entry("foo.txt");
+    sink.get_sink().add_entry("foo.txt");
     sink.write({"hello", 5});
-    sink.add_entry("bar/baz.txt");
+    sink.get_sink().add_entry("bar/baz.txt");
     sink.write({"bye", 3});
 }