From 25405809cbc7a72741d59d70193907f9afac3824 Mon Sep 17 00:00:00 2001
From: Eammon <esaunders@basistech.com>
Date: Tue, 21 Jan 2020 13:32:02 -0500
Subject: [PATCH] Fix for explicitly defaulted move assignment operator/copy
constructor is implicitly deleted error messages when building on MacOS
Catalina.
---
tsk/fs/apfs_fs.hpp | 4 ----
tsk/fs/tsk_apfs.hpp | 3 ---
tsk/pool/tsk_apfs.hpp | 1 -
3 files changed, 8 deletions(-)
diff --git a/tsk/fs/apfs_fs.hpp b/tsk/fs/apfs_fs.hpp
index b0643c512..4d39177dc 100644
--- a/tsk/fs/apfs_fs.hpp
+++ b/tsk/fs/apfs_fs.hpp
@@ -122,11 +122,7 @@ class APFSJObjTree {
uint64_t root_tree_oid,
const APFSFileSystem::crypto_info_t &crypto);
- APFSJObjTree(const APFSJObjTree &) = default;
- APFSJObjTree &operator=(const APFSJObjTree &) = default;
-
APFSJObjTree(APFSJObjTree &&) = default;
- APFSJObjTree &operator=(APFSJObjTree &&) = default;
inline APFSJObject obj(uint64_t oid) const { return {jobjs(oid)}; }
diff --git a/tsk/fs/tsk_apfs.hpp b/tsk/fs/tsk_apfs.hpp
index 52cb0c997..6bdc97622 100755
--- a/tsk/fs/tsk_apfs.hpp
+++ b/tsk/fs/tsk_apfs.hpp
@@ -573,11 +573,8 @@ class APFSJObjBtreeNode : public APFSBtreeNode<> {
APFSJObjBtreeNode(const APFSObjectBtreeNode *obj_root,
apfs_block_num block_num, const uint8_t *key);
- APFSJObjBtreeNode(const APFSJObjBtreeNode &) = default;
- APFSJObjBtreeNode &operator=(const APFSJObjBtreeNode &) = default;
APFSJObjBtreeNode(APFSJObjBtreeNode &&) = default;
- APFSJObjBtreeNode &operator=(APFSJObjBtreeNode &&) = default;
using iterator = APFSBtreeNodeIterator<APFSJObjBtreeNode>;
diff --git a/tsk/pool/tsk_apfs.hpp b/tsk/pool/tsk_apfs.hpp
index 0eaa02dac..6dea8f6e7 100755
--- a/tsk/pool/tsk_apfs.hpp
+++ b/tsk/pool/tsk_apfs.hpp
@@ -35,7 +35,6 @@ class APFSBlock {
// Move constructible
APFSBlock(APFSBlock &&) = default;
- APFSBlock &operator=(APFSBlock &&) = default;
virtual ~APFSBlock() = default;
--
GitLab