# HG changeset patch # User David Demelier # Date 1503306598 -7200 # Node ID 1c9d99ac4b681f4009c7fbc048cdce9a26c14e90 # Parent 18ec7f4fc3de7c56979b0afa6aee1e5257f42a3c Misc: remove clamp, there is alternative in boost diff -r 18ec7f4fc3de -r 1c9d99ac4b68 misc/clamp.hpp --- a/misc/clamp.hpp Mon Aug 21 11:08:49 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ -/* - * clamp.hpp -- clamp a value - * - * Copyright (c) 2013-2016 David Demelier - * - * 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. - */ - -/** - * \file clamp.hpp - * \brief Clamp function - */ - -#include - -/** - * 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 -constexpr T clamp(T value, T low, T high) noexcept -{ - return (value < high) ? std::max(value, low) : std::min(value, high); -} \ No newline at end of file diff -r 18ec7f4fc3de -r 1c9d99ac4b68 misc/test-all.cpp --- a/misc/test-all.cpp Mon Aug 21 11:08:49 2017 +0200 +++ b/misc/test-all.cpp Mon Aug 21 11:09:58 2017 +0200 @@ -18,7 +18,6 @@ #include -#include "test-clamp.cpp" #include "test-join.cpp" #include "test-strip.cpp" diff -r 18ec7f4fc3de -r 1c9d99ac4b68 misc/test-clamp.cpp --- a/misc/test-clamp.cpp Mon Aug 21 11:08:49 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,44 +0,0 @@ -/* - * test-clamp.cpp -- test clamp function - * - * Copyright (c) 2013-2016 David Demelier - * - * 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. - */ - -#include "clamp.hpp" - -TEST(Clamp, normal) -{ - ASSERT_EQ(5, clamp(5, 0, 10)); -} - -TEST(Clamp, minimum) -{ - ASSERT_EQ(0, clamp(0, 0, 10)); -} - -TEST(Clamp, maximum) -{ - ASSERT_EQ(10, clamp(10, 0, 10)); -} - -TEST(Clamp, less) -{ - ASSERT_EQ(0, clamp(-10, 0, 10)); -} - -TEST(Clamp, higher) -{ - ASSERT_EQ(10, clamp(20, 0, 10)); -}