struct cmd_struct;
struct session_spec {
- enum type {
+ enum class type {
NAME,
GLOB_PATTERN,
ALL,
};
- type type;
+ explicit session_spec(type spec_type, const char *name_or_pattern = nullptr) noexcept :
+ type_(spec_type), value(name_or_pattern)
+ {
+ }
+
+ /* Disambiguate type enum from the member for buggy g++ versions. */
+ type type_;
const char *value;
};
*/
class session_list {
template <typename ContainerType, typename DereferenceReturnType>
- class iterator_template : public std::iterator<std::random_access_iterator_tag, std::size_t> {
+ class _iterator
+ : public std::iterator<std::random_access_iterator_tag, std::size_t> {
public:
- explicit iterator_template(ContainerType& list, std::size_t k) : _list(list), _index(k)
+ explicit _iterator(ContainerType& list, std::size_t k) :
+ _list(list), _index(k)
{
}
- iterator_template& operator++() noexcept
+ _iterator& operator++() noexcept
{
++_index;
return *this;
}
- iterator_template& operator--() noexcept
+ _iterator& operator--() noexcept
{
--_index;
return *this;
}
- iterator_template& operator++(int) noexcept
+ _iterator& operator++(int) noexcept
{
_index++;
return *this;
}
- iterator_template& operator--(int) noexcept
+ _iterator& operator--(int) noexcept
{
_index--;
return *this;
}
- bool operator==(iterator_template other) const noexcept
+ bool operator==(_iterator other) const noexcept
{
return _index == other._index;
}
- bool operator!=(iterator_template other) const noexcept
+ bool operator!=(_iterator other) const noexcept
{
return !(*this == other);
}
std::size_t _index;
};
- using iterator = iterator_template<session_list, lttng_session>;
- using const_iterator = iterator_template<const session_list, const lttng_session>;
+ using iterator = _iterator<session_list, lttng_session>;
+ using const_iterator = _iterator<const session_list, const lttng_session>;
public:
session_list() : _sessions_count(0), _sessions(nullptr)
private:
std::size_t _sessions_count;
std::unique_ptr<lttng_session,
- lttng::details::create_unique_class<lttng_session, lttng::free>>
+ lttng::memory::create_deleter_class<lttng_session, lttng::free>::deleter>
_sessions;
};