From 73b445dd8033213f32f663ef29bbb5f4a241df5c Mon Sep 17 00:00:00 2001
From: Joe Sylve <joe.sylve@gmail.com>
Date: Sat, 5 Jan 2019 20:32:40 -0600
Subject: [PATCH] Fixed compile issue that was caused by a bug in older
versions of clang
---
tsk/fs/apfs_fs.hpp | 8 ++++----
tsk/fs/tsk_apfs.hpp | 2 +-
tsk/pool/tsk_pool.hpp | 4 ++--
tsk/util/lw_shared_ptr.hpp | 2 +-
tsk/util/span.hpp | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tsk/fs/apfs_fs.hpp b/tsk/fs/apfs_fs.hpp
index fe5aed238..8c2a19075 100644
--- a/tsk/fs/apfs_fs.hpp
+++ b/tsk/fs/apfs_fs.hpp
@@ -133,7 +133,7 @@ class APFSJObjTree {
APFSJObjTree(const APFSJObjTree &) = default;
APFSJObjTree &operator=(const APFSJObjTree &) = default;
- APFSJObjTree(APFSJObjTree &&) noexcept = default;
+ APFSJObjTree(APFSJObjTree &&) = default;
APFSJObjTree &operator=(APFSJObjTree &&) = default;
inline APFSJObject obj(uint64_t oid) const { return {jobjs(oid)}; }
@@ -164,13 +164,13 @@ class APFSJObjTree::iterator {
iterator(const APFSJObjTree *tree, uint64_t oid);
public:
- iterator() noexcept = default;
+ iterator() = default;
iterator(const iterator &) = default;
iterator &operator=(const iterator &) = default;
- iterator(iterator &&) noexcept = default;
- iterator &operator=(iterator &&) noexcept = default;
+ iterator(iterator &&) = default;
+ iterator &operator=(iterator &&) = default;
inline reference operator*() const noexcept { return _jobj; }
diff --git a/tsk/fs/tsk_apfs.hpp b/tsk/fs/tsk_apfs.hpp
index 8f0bb0713..ee92f64fe 100755
--- a/tsk/fs/tsk_apfs.hpp
+++ b/tsk/fs/tsk_apfs.hpp
@@ -175,7 +175,7 @@ class APFSBtreeNodeIterator {
public:
// Forward iterators must be DefaultConstructible
- APFSBtreeNodeIterator() noexcept = default;
+ APFSBtreeNodeIterator() = default;
APFSBtreeNodeIterator(const Node *node, uint32_t index);
diff --git a/tsk/pool/tsk_pool.hpp b/tsk/pool/tsk_pool.hpp
index d035e53bc..78081dbff 100644
--- a/tsk/pool/tsk_pool.hpp
+++ b/tsk/pool/tsk_pool.hpp
@@ -24,8 +24,8 @@ class TSKPool {
TSKPool &operator=(const TSKPool &) = delete;
// Moveable
- TSKPool(TSKPool &&) noexcept = default;
- TSKPool &operator=(TSKPool &&) noexcept = default;
+ TSKPool(TSKPool &&) = default;
+ TSKPool &operator=(TSKPool &&) = default;
virtual ~TSKPool() = default;
diff --git a/tsk/util/lw_shared_ptr.hpp b/tsk/util/lw_shared_ptr.hpp
index 8fc77d48e..7c3e83157 100755
--- a/tsk/util/lw_shared_ptr.hpp
+++ b/tsk/util/lw_shared_ptr.hpp
@@ -17,7 +17,7 @@ template <typename T>
class lw_shared_ptr {
public:
/// Constructs a shared_ptr with no managed object, i.e. empty shared_ptr
- lw_shared_ptr() noexcept = default;
+ lw_shared_ptr() = default;
/// Constructs a shared_ptr with no managed object, i.e. empty shared_ptr
lw_shared_ptr(std::nullptr_t) noexcept : lw_shared_ptr() {}
diff --git a/tsk/util/span.hpp b/tsk/util/span.hpp
index 63b7d9ac4..dc4000b43 100755
--- a/tsk/util/span.hpp
+++ b/tsk/util/span.hpp
@@ -22,7 +22,7 @@ class span {
index_type _count{};
public:
- span() noexcept = default;
+ span() = default;
span(std::nullptr_t) noexcept : span() {}
span(pointer p, index_type n) noexcept : _storage{p}, _count{n} {}
--
GitLab