Merge pull request #1837 from joto/output-requirements-private

Make output_t::m_output_requirements private

Author: lonvia

src/output-flex.cpp

@@ -2012,7 +2012,7 @@ output_flex_t::output_flex_t(
     // it means we need two-stage processing which in turn means we need
     // the full ways stored in the middle.
     if (m_select_relation_members) {
-        m_output_requirements.full_ways = true;
+        access_requirements().full_ways = true;
     }
 
     if (m_tables->empty()) {

src/output.hpp

@@ -97,11 +97,6 @@ class output_t
         return m_output_requirements;
     }
 
-private:
-    std::shared_ptr<middle_query_t> m_mid;
-    options_t const *m_options;
-    std::shared_ptr<thread_pool_t> m_thread_pool;
-
 protected:
     /**
      * Constructor used for creating a new object using the create_output()
@@ -129,8 +124,17 @@ class output_t
         return *m_mid;
     }
 
+    output_requirements &access_requirements() noexcept
+    {
+        return m_output_requirements;
+    }
+
     const options_t *get_options() const noexcept { return m_options; };
 
+private:
+    std::shared_ptr<middle_query_t> m_mid;
+    options_t const *m_options;
+    std::shared_ptr<thread_pool_t> m_thread_pool;
     output_requirements m_output_requirements{};
 };