From 430875de5cad1c2288f06499b124b001dba44ba3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 4 Nov 2015 09:29:55 +0200 Subject: boost->std in include/tools Change-Id: I387340162d791bca2e589a2bad0575030138bd89 Reviewed-on: https://gerrit.libreoffice.org/19772 Tested-by: Jenkins Reviewed-by: Noel Grandin --- include/tools/helpers.hxx | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'include/tools') diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx index 8b04050bc918..858ec4f7fc50 100644 --- a/include/tools/helpers.hxx +++ b/include/tools/helpers.hxx @@ -12,18 +12,12 @@ #include #include - -#include -#include -#include -#include -#include +#include template inline -typename boost::enable_if< - boost::mpl::or_< boost::is_signed, boost::is_floating_point >, long> - ::type +typename std::enable_if< + std::is_signed::value || std::is_floating_point::value, long >::type MinMax(T nVal, long nMin, long nMax) { assert(nMin <= nMax); @@ -32,8 +26,10 @@ MinMax(T nVal, long nMin, long nMax) } template -inline typename boost::enable_if, long>::type MinMax( - T nVal, long nMin, long nMax) +inline +typename std::enable_if< + std::is_unsigned::value, long >::type +MinMax(T nVal, long nMin, long nMax) { assert(nMin <= nMax); return nMax < 0 -- cgit