Clean-up: lttng: utils: coding style fix

[lttng-tools.git] / src / bin / lttng / utils.hpp

diff --git a/src/bin/lttng/utils.hpp b/src/bin/lttng/utils.hpp
index 990bad57517bf33031c059fe667be5075318e19d..326f0ae746396312e235d105af4a8c4b8fe66011 100644 (file)
--- a/src/bin/lttng/utils.hpp
+++ b/src/bin/lttng/utils.hpp
@@ -26,13 +26,19 @@ extern pid_t sessiond_pid;
 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;
 };
 
@@ -41,11 +47,9 @@ struct session_spec {
  */
 class session_list {
        template <typename ContainerType, typename DereferenceReturnType>
-       class _iterator
-               : 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(ContainerType& list, std::size_t k) :
-                       _list(list), _index(k)
+               explicit _iterator(ContainerType& list, std::size_t k) : _list(list), _index(k)
                {
                }