# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1513605343 -3600
# Node ID 4761e7cbb6f7e6ec4686cbee1b0b0aedc1660ba5
# Parent  4ee71022784c5ecf93ae488ffb53e8bc3bc31c9c
Common: remove util.hpp, closes #757

diff -r 4ee71022784c -r 4761e7cbb6f7 irccdctl/main.cpp
--- a/irccdctl/main.cpp	Mon Dec 18 11:12:45 2017 +0100
+++ b/irccdctl/main.cpp	Mon Dec 18 14:55:43 2017 +0100
@@ -28,7 +28,6 @@
 #include <irccd/options.hpp>
 #include <irccd/string_util.hpp>
 #include <irccd/system.hpp>
-#include <irccd/util.hpp>
 
 #include <irccd/ctl/controller.hpp>
 #include <irccd/ctl/ip_connection.hpp>
diff -r 4ee71022784c -r 4761e7cbb6f7 libcommon/CMakeLists.txt
--- a/libcommon/CMakeLists.txt	Mon Dec 18 11:12:45 2017 +0100
+++ b/libcommon/CMakeLists.txt	Mon Dec 18 14:55:43 2017 +0100
@@ -30,7 +30,6 @@
     ${libcommon_SOURCE_DIR}/irccd/options.hpp
     ${libcommon_SOURCE_DIR}/irccd/string_util.hpp
     ${libcommon_SOURCE_DIR}/irccd/system.hpp
-    ${libcommon_SOURCE_DIR}/irccd/util.hpp
     ${libcommon_SOURCE_DIR}/irccd/xdg.hpp
 )
 
diff -r 4ee71022784c -r 4761e7cbb6f7 libcommon/irccd/util.hpp
--- a/libcommon/irccd/util.hpp	Mon Dec 18 11:12:45 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
- * util.hpp -- some utilities
- *
- * Copyright (c) 2013-2017 David Demelier <markand@malikania.fr>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef IRCCD_COMMON_UTIL_HPP
-#define IRCCD_COMMON_UTIL_HPP
-
-/**
- * \file util.hpp
- * \brief Utilities.
- */
-
-#include <algorithm>
-
-namespace irccd {
-
-/**
- * \brief Namespace for utilities.
- */
-namespace util {
-
-/**
- * Clamp the value between low and high.
- *
- * \param value the value
- * \param low the minimum value
- * \param high the maximum value
- * \return the value between minimum and maximum
- */
-template <typename T>
-constexpr T clamp(T value, T low, T high) noexcept
-{
-    return (value < high) ? std::max(value, low) : std::min(value, high);
-}
-
-/**
- * Use arguments to avoid compiler warnings about unused parameters.
- */
-template <typename... Args>
-inline void unused(Args&&...) noexcept
-{
-}
-
-} // !util
-
-} // !irccd
-
-#endif // !IRCCD_UTIL_HPP
diff -r 4ee71022784c -r 4761e7cbb6f7 libirccd/irccd/daemon/command.cpp
--- a/libirccd/irccd/daemon/command.cpp	Mon Dec 18 11:12:45 2017 +0100
+++ b/libirccd/irccd/daemon/command.cpp	Mon Dec 18 14:55:43 2017 +0100
@@ -18,7 +18,6 @@
 
 #include <irccd/json_util.hpp>
 #include <irccd/string_util.hpp>
-#include <irccd/util.hpp>
 
 #include "command.hpp"
 #include "irccd.hpp"
diff -r 4ee71022784c -r 4761e7cbb6f7 libirccd/irccd/daemon/plugin.hpp
--- a/libirccd/irccd/daemon/plugin.hpp	Mon Dec 18 11:12:45 2017 +0100
+++ b/libirccd/irccd/daemon/plugin.hpp	Mon Dec 18 14:55:43 2017 +0100
@@ -37,8 +37,6 @@
 #include <unordered_map>
 #include <vector>
 
-#include <irccd/util.hpp>
-
 #include "server.hpp"
 
 namespace irccd {
@@ -215,7 +213,7 @@
      */
     virtual void set_config(plugin_config config)
     {
-        util::unused(config);
+        (void)config;
     }
 
     /**
@@ -235,7 +233,7 @@
      */
     virtual void set_formats(plugin_formats formats)
     {
-        util::unused(formats);
+        (void)formats;
     }
 
     /**
@@ -255,7 +253,7 @@
      */
     virtual void set_paths(plugin_paths paths)
     {
-        util::unused(paths);
+        (void)paths;
     }
 
     /**
@@ -268,7 +266,8 @@
      */
     virtual void on_command(irccd& irccd, const message_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -279,7 +278,8 @@
      */
     virtual void on_connect(irccd& irccd, const connect_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -290,7 +290,8 @@
      */
     virtual void on_invite(irccd& irccd, const invite_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -301,7 +302,8 @@
      */
     virtual void on_join(irccd& irccd, const join_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -312,7 +314,8 @@
      */
     virtual void on_kick(irccd& irccd, const kick_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -322,7 +325,7 @@
      */
     virtual void on_load(irccd& irccd)
     {
-        util::unused(irccd);
+        (void)irccd;
     }
 
     /**
@@ -333,7 +336,8 @@
      */
     virtual void on_message(irccd& irccd, const message_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -344,7 +348,8 @@
      */
     virtual void on_me(irccd& irccd, const me_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -355,7 +360,8 @@
      */
     virtual void on_mode(irccd& irccd, const mode_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -366,7 +372,8 @@
      */
     virtual void on_names(irccd& irccd, const names_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -377,7 +384,8 @@
      */
     virtual void on_nick(irccd& irccd, const nick_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -388,7 +396,8 @@
      */
     virtual void on_notice(irccd& irccd, const notice_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -399,7 +408,8 @@
      */
     virtual void on_part(irccd& irccd, const part_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -409,7 +419,7 @@
      */
     virtual void on_reload(irccd& irccd)
     {
-        util::unused(irccd);
+        (void)irccd;
     }
 
     /**
@@ -420,7 +430,8 @@
      */
     virtual void on_topic(irccd& irccd, const topic_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 
     /**
@@ -430,7 +441,7 @@
      */
     virtual void on_unload(irccd& irccd)
     {
-        util::unused(irccd);
+        (void)irccd;
     }
 
     /**
@@ -441,7 +452,8 @@
      */
     virtual void on_whois(irccd& irccd, const whois_event& event)
     {
-        util::unused(irccd, event);
+        (void)irccd;
+        (void)event;
     }
 };
 
diff -r 4ee71022784c -r 4761e7cbb6f7 tests/src/libirccd/util/main.cpp
--- a/tests/src/libirccd/util/main.cpp	Mon Dec 18 11:12:45 2017 +0100
+++ b/tests/src/libirccd/util/main.cpp	Mon Dec 18 14:55:43 2017 +0100
@@ -21,7 +21,6 @@
 
 #include <cstdint>
 
-#include <irccd/util.hpp>
 #include <irccd/fs_util.hpp>
 #include <irccd/string_util.hpp>
 #include <irccd/system.hpp>