From e96a719724e3326c130a80d71f8ff3e433593353 Mon Sep 17 00:00:00 2001
From: Edward Hennis <ed@ripple.com>
Date: Fri, 11 Dec 2020 15:14:35 -0800
Subject: [PATCH] Fix compiler warnings & linker errors:

Changes introduced with 1.7.0-b5 and 1.7.0-b6 could result in compiler
warnings and/or linker errors when compiling in certain configurations.
---
 src/ripple/shamap/SHAMapInnerNode.h        | 1 +
 src/ripple/shamap/impl/CMakeLists.txt      | 0
 src/ripple/shamap/impl/SHAMapInnerNode.cpp | 2 ++
 src/ripple/shamap/impl/TaggedPointer.h     | 5 -----
 src/ripple/shamap/impl/TaggedPointer.ipp   | 5 +++++
 5 files changed, 8 insertions(+), 5 deletions(-)
 create mode 100644 src/ripple/shamap/impl/CMakeLists.txt

diff --git a/src/ripple/shamap/SHAMapInnerNode.h b/src/ripple/shamap/SHAMapInnerNode.h
index 727745788..43328eb6b 100644
--- a/src/ripple/shamap/SHAMapInnerNode.h
+++ b/src/ripple/shamap/SHAMapInnerNode.h
@@ -108,6 +108,7 @@ public:
     SHAMapInnerNode(SHAMapInnerNode const&) = delete;
     SHAMapInnerNode&
     operator=(SHAMapInnerNode const&) = delete;
+    ~SHAMapInnerNode();
 
     std::shared_ptr<SHAMapTreeNode>
     clone(std::uint32_t cowid) const override;
diff --git a/src/ripple/shamap/impl/CMakeLists.txt b/src/ripple/shamap/impl/CMakeLists.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/ripple/shamap/impl/SHAMapInnerNode.cpp b/src/ripple/shamap/impl/SHAMapInnerNode.cpp
index fc945dcd1..0ef0dd455 100644
--- a/src/ripple/shamap/impl/SHAMapInnerNode.cpp
+++ b/src/ripple/shamap/impl/SHAMapInnerNode.cpp
@@ -49,6 +49,8 @@ SHAMapInnerNode::SHAMapInnerNode(
 {
 }
 
+SHAMapInnerNode::~SHAMapInnerNode() = default;
+
 template <class F>
 void
 SHAMapInnerNode::iterChildren(F&& f) const
diff --git a/src/ripple/shamap/impl/TaggedPointer.h b/src/ripple/shamap/impl/TaggedPointer.h
index 02ad087ca..2371d8ddb 100644
--- a/src/ripple/shamap/impl/TaggedPointer.h
+++ b/src/ripple/shamap/impl/TaggedPointer.h
@@ -217,11 +217,6 @@ public:
     getChildIndex(std::uint16_t isBranch, int i) const;
 };
 
-inline TaggedPointer::~TaggedPointer()
-{
-    destroyHashesAndChildren();
-}
-
 }  // namespace ripple
 
 #endif
diff --git a/src/ripple/shamap/impl/TaggedPointer.ipp b/src/ripple/shamap/impl/TaggedPointer.ipp
index 93403932d..c97b7433e 100644
--- a/src/ripple/shamap/impl/TaggedPointer.ipp
+++ b/src/ripple/shamap/impl/TaggedPointer.ipp
@@ -636,4 +636,9 @@ TaggedPointer::getChildren() const
     return result;
 };
 
+inline TaggedPointer::~TaggedPointer()
+{
+    destroyHashesAndChildren();
+}
+
 }  // namespace ripple