#128 Extract context related definitions in context.inl

include/ureact/context.hpp

@@ -10,17 +10,43 @@
 #ifndef UREACT_CONTEXT_HPP
 #define UREACT_CONTEXT_HPP
 
+#include <memory>
+
 #include <ureact/detail/defines.hpp>
 #include <ureact/detail/graph_impl.hpp>
 
 UREACT_BEGIN_NAMESPACE
 
+namespace detail
+{
+
+class context_internals
+{
+public:
+    explicit context_internals(
+        std::shared_ptr<react_graph> graph = std::make_shared<react_graph>() );
+
+    UREACT_WARN_UNUSED_RESULT react_graph& get_graph();
+    UREACT_WARN_UNUSED_RESULT const react_graph& get_graph() const;
+
+private:
+    std::shared_ptr<react_graph> m_graph_ptr;
+};
+
+} // namespace detail
+
 class context;
 
 namespace default_context
 {
+
+/**
+ * @brief Return default context
+ * Default contexts are thread_local
+ */
 context get();
-}
+
+} // namespace default_context
 
 /*!
  * @brief Core class that connects all reactive nodes together.
@@ -77,34 +103,13 @@ class context final : protected detail::context_internals
     /*!
      * @brief Construct @ref context from given react_graph
      */
-    explicit context( std::shared_ptr<detail::react_graph> graph )
-        : detail::context_internals( std::move( graph ) )
-    {}
+    explicit context( std::shared_ptr<detail::react_graph> graph );
 };
 
-namespace default_context
-{
-
-/**
- * @brief Return default context
- * Default contexts are thread_local
- */
-inline context get()
-{
-    thread_local static std::weak_ptr<detail::react_graph> s_instance;
-
-    auto graphPtr = s_instance.lock();
-
-    if( !graphPtr )
-    {
-        s_instance = graphPtr = std::make_shared<detail::react_graph>();
-    }
-
-    return context{ std::move( graphPtr ) };
-}
-
-} // namespace default_context
-
 UREACT_END_NAMESPACE
 
+#if UREACT_HEADER_ONLY
+#    include <ureact/detail/context.inl>
+#endif
+
 #endif //UREACT_CONTEXT_HPP

include/ureact/detail/context.inl

@@ -0,0 +1,64 @@
+//
+//         Copyright (C) 2014-2017 Sebastian Jeckel.
+//         Copyright (C) 2020-2023 Krylov Yaroslav.
+//
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef UREACT_DETAIL_CONTEXT_INL
+#define UREACT_DETAIL_CONTEXT_INL
+
+#include <memory>
+
+#include <ureact/detail/defines.hpp>
+#include <ureact/detail/graph_impl.hpp>
+
+UREACT_BEGIN_NAMESPACE
+
+namespace detail
+{
+
+UREACT_FUNC context_internals::context_internals( std::shared_ptr<react_graph> graph )
+    : m_graph_ptr( std::move( graph ) )
+{}
+
+UREACT_FUNC react_graph& context_internals::get_graph()
+{
+    return *m_graph_ptr;
+}
+
+UREACT_FUNC const react_graph& context_internals::get_graph() const
+{
+    return *m_graph_ptr;
+}
+
+} // namespace detail
+
+UREACT_FUNC context::context( std::shared_ptr<detail::react_graph> graph )
+    : detail::context_internals( std::move( graph ) )
+{}
+
+namespace default_context
+{
+
+UREACT_FUNC context get()
+{
+    thread_local static std::weak_ptr<detail::react_graph> s_instance;
+
+    auto graphPtr = s_instance.lock();
+
+    if( !graphPtr )
+    {
+        s_instance = graphPtr = std::make_shared<detail::react_graph>();
+    }
+
+    return context{ std::move( graphPtr ) };
+}
+
+} // namespace default_context
+
+UREACT_END_NAMESPACE
+
+#endif //UREACT_DETAIL_CONTEXT_INL

include/ureact/detail/graph_impl.hpp

@@ -430,28 +430,6 @@ UREACT_WARN_UNUSED_RESULT inline bool react_graph::topological_queue::fetch_next
     return !m_next_data.empty();
 }
 
-class context_internals
-{
-public:
-    explicit context_internals(
-        std::shared_ptr<detail::react_graph> graph = std::make_shared<react_graph>() )
-        : m_graph_ptr( std::move( graph ) )
-    {}
-
-    UREACT_WARN_UNUSED_RESULT react_graph& get_graph()
-    {
-        return *m_graph_ptr;
-    }
-
-    UREACT_WARN_UNUSED_RESULT const react_graph& get_graph() const
-    {
-        return *m_graph_ptr;
-    }
-
-private:
-    std::shared_ptr<react_graph> m_graph_ptr;
-};
-
 } // namespace detail
 
 UREACT_END_NAMESPACE