Skip to content

Commit 6dc29ee

Browse files
committed
Make output_t::m_output_requirements private
1 parent 6767263 commit 6dc29ee

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/output-flex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2012,7 +2012,7 @@ output_flex_t::output_flex_t(
20122012
// it means we need two-stage processing which in turn means we need
20132013
// the full ways stored in the middle.
20142014
if (m_select_relation_members) {
2015-
m_output_requirements.full_ways = true;
2015+
access_requirements().full_ways = true;
20162016
}
20172017

20182018
if (m_tables->empty()) {

src/output.hpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ class output_t
9797
return m_output_requirements;
9898
}
9999

100-
private:
101-
std::shared_ptr<middle_query_t> m_mid;
102-
options_t const *m_options;
103-
std::shared_ptr<thread_pool_t> m_thread_pool;
104-
105100
protected:
106101
/**
107102
* Constructor used for creating a new object using the create_output()
@@ -129,8 +124,17 @@ class output_t
129124
return *m_mid;
130125
}
131126

127+
output_requirements &access_requirements() noexcept
128+
{
129+
return m_output_requirements;
130+
}
131+
132132
const options_t *get_options() const noexcept { return m_options; };
133133

134+
private:
135+
std::shared_ptr<middle_query_t> m_mid;
136+
options_t const *m_options;
137+
std::shared_ptr<thread_pool_t> m_thread_pool;
134138
output_requirements m_output_requirements{};
135139
};
136140

0 commit comments

Comments
 (0)