sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4276 from mathisloge/remove_cxx11_support

Browse source 
remove cxx11_support.hpp
This commit is contained in:
Artem Pavlenko 2022-01-28 09:18:53 +00:00 committed by GitHub
commit dafdbb01ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
include/mapnik/cxx11_support.hpp
View file

@ -1,43 +0,0 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2021 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef MAPNIK_CXX11_SUPPORT_HPP
#define MAPNIK_CXX11_SUPPORT_HPP
#include <type_traits>
namespace mapnik {
namespace detail {
template <bool B, typename T, typename F>
using conditional_t = typename std::conditional<B, T, F>::type;
template <typename T>
using decay_t = typename std::decay<T>::type;
template <bool B, typename T = void>
using enable_if_t = typename std::enable_if<B, T>::type;
} // namespace detail
} // namespace mapnik
#endif // MAPNIK_CXX11_SUPPORT_HPP

11
include/mapnik/value/types.hpp
View file

@ -25,9 +25,8 @@
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/cxx11_support.hpp>
#include <mapnik/pixel_types.hpp>
#include <type_traits>
#include <mapnik/warning.hpp>
MAPNIK_DISABLE_WARNING_PUSH
@ -161,13 +160,13 @@ namespace detail {
// value_double if T is a floating-point type
// T && otherwise
template <typename T, typename dT = decay_t<T>>
template <typename T, typename dT = std::decay_t<T>>
using mapnik_value_type_t =
conditional_t<
std::conditional_t<
std::is_same<dT, bool>::value, value_bool,
conditional_t<
std::conditional_t<
std::is_integral<dT>::value, value_integer,
conditional_t<
std::conditional_t<
std::is_floating_point<dT>::value, value_double,
T && >>>;