]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
- drop support for boost prior to 1.41
authorArvin Schnell <aschnell@suse.de>
Wed, 4 Jan 2023 09:16:13 +0000 (10:16 +0100)
committerArvin Schnell <aschnell@suse.de>
Wed, 4 Jan 2023 09:16:13 +0000 (10:16 +0100)
snapper/Btrfs.cc

index 5e68fcebd9a7d181acf6124a298c0a04d68cc43b..bcd9b765dae7350bcf6be4549a48571964d1f113 100644 (file)
@@ -681,10 +681,6 @@ namespace snapper
 
        bool dumper(int fd);
 
-#if BOOST_VERSION < 104100
-       bool dumper_ret;
-#endif
-
        void do_send(u64 parent_root_id, const vector<u64>& clone_sources);
 
     };
@@ -1267,19 +1263,11 @@ namespace snapper
            {
                y2err("btrfs_read_and_process_send_stream failed " << r);
 
-#if BOOST_VERSION < 104100
-               dumper_ret = false;
-#endif
-
                return false;
            }
 
            if (r)
            {
-#if BOOST_VERSION < 104100
-               dumper_ret = true;
-#endif
-
                return true;
            }
 
@@ -1311,8 +1299,6 @@ namespace snapper
        io_send.parent_root = parent_root_id;
        io_send.flags = BTRFS_SEND_FLAG_NO_FILE_DATA;
 
-#if BOOST_VERSION >= 104100
-
        boost::packaged_task<bool> pt(boost::bind(&StreamProcessor::dumper, this, pipefd[0]));
        boost::unique_future<bool> uf = pt.get_future();
 
@@ -1334,29 +1320,6 @@ namespace snapper
        {
            SN_THROW(BtrfsSendReceiveException());
        }
-
-#else
-
-       boost::thread dumper_thread(boost::bind(&StreamProcessor::dumper, this, pipefd[0]));
-
-       fd0_closer.reset();
-
-       int r2 = ioctl(dir2.fd(), BTRFS_IOC_SEND, &io_send);
-       if (r2 < 0)
-       {
-           y2err("send ioctl failed errno:" << errno << " (" << stringerror(errno) << ")");
-       }
-
-       fd1_closer.close();
-
-       dumper_thread.join();
-
-       if (r2 < 0 || !dumper_ret)
-       {
-           SN_THROW(BtrfsSendReceiveException());
-       }
-
-#endif
     }