chore: makeInterface does not share

Author: vinniefalco

include/mrdox/Metadata/Interface.hpp

@@ -15,7 +15,6 @@
 #include <mrdox/Platform.hpp>
 #include <mrdox/MetadataFwd.hpp>
 #include <mrdox/Metadata/Record.hpp>
-#include <mrdox/Support/SharedPtr.hpp>
 #include <memory>
 #include <span>
 #include <utility>
@@ -58,7 +57,7 @@ class Interface
 
     MRDOX_DECL
     friend
-    SharedPtr<Interface>
+    Interface
     makeInterface(
         RecordInfo const& Derived,
         Corpus const& corpus);
@@ -90,7 +89,7 @@ class Interface
     @param corpus The complete metadata.
 */
 MRDOX_DECL
-SharedPtr<Interface>
+Interface
 makeInterface(
     RecordInfo const& Derived,
     Corpus const& corpus);

source/Metadata/DomMetadata.cpp

@@ -664,12 +664,12 @@ template<class T>
 class DomTrancheArray : public dom::Array
 {
     std::span<T const*> list_;
-    SharedPtr<Interface> sp_;
+    std::shared_ptr<Interface> sp_;
 
 public:
     DomTrancheArray(
         std::span<T const*> list,
-        SharedPtr<Interface> const& sp)
+        std::shared_ptr<Interface> const& sp)
         : list_(list)
         , sp_(sp)
     {
@@ -692,23 +692,23 @@ class DomTrancheArray : public dom::Array
 
 class DomTranche : public dom::Object
 {
-    SharedPtr<Interface> sp_;
+    std::shared_ptr<Interface> sp_;
     Interface::Tranche const& tranche_;
 
     template<class T>
     static
     dom::Value
     init(
         std::span<T const*> list,
-        SharedPtr<Interface> const& sp)
+        std::shared_ptr<Interface> const& sp)
     {
         return makeShared<DomTrancheArray<T>>(list, sp);
     }
 
 public:
     DomTranche(
         Interface::Tranche const& tranche,
-        SharedPtr<Interface> const& sp) noexcept
+        std::shared_ptr<Interface> const& sp) noexcept
         : dom::Object({
             { "records",    init(tranche.Records, sp) },
             { "functions",  init(tranche.Functions, sp) },
@@ -727,8 +727,8 @@ class DomTranche : public dom::Object
 class DomInterface : public dom::LazyObject
 {
     RecordInfo const& I_;
-    AtomicSharedPtr<Interface> sp_;
     Corpus const& corpus_;
+    //std::shared_ptr<Interface> sp_;
 
 public:
     DomInterface(
@@ -739,32 +739,22 @@ class DomInterface : public dom::LazyObject
     {
     }
 
-    SharedPtr<Interface>
-    getInterface() const
-    {
-        return sp_.load(
-            [&]
-            {
-                return makeInterface(I_, corpus_);
-            });
-    }
-
-    dom::ObjectPtr construct() const override
+    dom::ObjectPtr
+    construct() const override
     {
+        auto sp = std::make_shared<Interface>(
+            makeInterface(I_, corpus_));
         return makeShared<dom::Object>(
             dom::Object::list_type({
                 { "public",
                     makeShared<DomTranche>(
-                        getInterface()->Public,
-                        getInterface()) },
+                        sp->Public, sp) },
                 { "protected",
                     makeShared<DomTranche>(
-                        getInterface()->Protected,
-                        getInterface()) },
+                        sp->Protected, sp) },
                 { "private",
                     makeShared<DomTranche>(
-                        getInterface()->Private,
-                        getInterface()) },
+                        sp->Private, sp) }
                 }));
     }
 };

source/Metadata/Interface.cpp

@@ -224,14 +224,14 @@ Interface(
 {
 }
 
-SharedPtr<Interface>
+Interface
 makeInterface(
     RecordInfo const& Derived,
     Corpus const& corpus)
 {
     Interface I(corpus);
     Interface::Build(I, Derived, corpus);
-    return makeShared<Interface>(std::move(I));
+    return I;
 }
 
 } // mrdox