Remove remove_volatile

This commit is contained in:
Victor Zverovich 2019-06-10 20:25:04 -07:00
parent afdbbac75c
commit a48daa60e5

View File

@ -757,7 +757,7 @@ template <typename Context> struct arg_mapper {
FMT_CONSTEXPR bool map(bool val) { return val; } FMT_CONSTEXPR bool map(bool val) { return val; }
template <typename T, FMT_ENABLE_IF(is_char<T>::value)> template <typename T, FMT_ENABLE_IF(is_char<T>::value)>
FMT_CONSTEXPR char_type map(const T& val) { FMT_CONSTEXPR char_type map(T val) {
static_assert( static_assert(
std::is_same<T, char>::value || std::is_same<T, char_type>::value, std::is_same<T, char>::value || std::is_same<T, char_type>::value,
"mixing character types is disallowed"); "mixing character types is disallowed");
@ -985,13 +985,10 @@ class locale_ref {
template <typename Context, typename T> template <typename Context, typename T>
using get_type = using get_type =
type_constant<decltype(arg_mapper<Context>().map( type_constant<decltype(arg_mapper<Context>().map(std::declval<T>())),
std::declval<typename std::remove_volatile<T>::type>())),
typename Context::char_type>; typename Context::char_type>;
template <typename Context> constexpr unsigned long long get_types() { template <typename> constexpr unsigned long long get_types() { return 0; }
return 0;
}
template <typename Context, typename Arg, typename... Args> template <typename Context, typename Arg, typename... Args>
constexpr unsigned long long get_types() { constexpr unsigned long long get_types() {