X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.hpp;h=7f398397a95a38ca585bcfcd000095497f913c6d;hb=77c8b540e0389c630764b6298ec71f81ed03c72d;hp=d790e74d4f8bed24b89cbe768656c202df311266;hpb=4d4c8b8e68081f91347458b7e072dcfcac32385b;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.hpp b/src/bin/lttng/utils.hpp
index d790e74d4..7f398397a 100644
--- a/src/bin/lttng/utils.hpp
+++ b/src/bin/lttng/utils.hpp
@@ -57,7 +57,7 @@ public:
 	{
 	}
 
-	session_storage(session_storage&& original) :
+	session_storage(session_storage&& original) noexcept :
 		_array(std::move(original._array)), _count(original._count)
 	{
 	}
@@ -67,6 +67,11 @@ public:
 	{
 	}
 
+	session_storage(session_storage&) = delete;
+	session_storage& operator=(const session_storage& other) = delete;
+	session_storage& operator=(session_storage&& other) = delete;
+	~session_storage() = default;
+
 	lttng_session_uptr _array = nullptr;
 	std::size_t _count = 0;
 };
@@ -104,7 +109,7 @@ public:
 	{
 	}
 
-	session_list(session_list&& original) :
+	session_list(session_list&& original) noexcept :
 		lttng::utils::random_access_container_wrapper<details::session_storage,
 							      lttng_session&,
 							      details::session_list_operations>(
@@ -128,6 +133,11 @@ public:
 	{
 	}
 
+	session_list(session_list&) = delete;
+	session_list& operator=(const session_list& other) = delete;
+	session_list& operator=(session_list&& other) = delete;
+	~session_list() = default;
+
 	void resize(std::size_t new_size) noexcept
 	{
 		_container._count = new_size;
@@ -138,8 +148,8 @@ lttng::cli::session_list list_sessions(const struct session_spec& spec);
 } /* namespace cli */
 } /* namespace lttng */
 
-char *get_session_name(void);
-char *get_session_name_quiet(void);
+char *get_session_name();
+char *get_session_name_quiet();
 void list_commands(struct cmd_struct *commands, FILE *ofp);
 void list_cmd_options(FILE *ofp, struct poptOption *options);
 void list_cmd_options_argpar(FILE *ofp, const struct argpar_opt_descr *options);
@@ -167,7 +177,7 @@ const char *get_event_type_str(enum lttng_event_type event_type);
 int print_missing_or_multiple_domains(unsigned int domain_count, bool include_agent_domains);
 
 int spawn_relayd(const char *pathname, int port);
-int check_relayd(void);
+int check_relayd();
 void print_session_stats(const char *session_name);
 int get_session_stats_str(const char *session_name, char **str);
 int show_cmd_help(const char *cmd_name, const char *help_msg);