diff --git a/include/fmt/format.h b/include/fmt/format.h index 57d410ce..3f761f24 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -307,17 +307,13 @@ class format_error : public std::runtime_error { namespace internal { #if FMT_SECURE_SCL -template struct checked { - typedef stdext::checked_array_iterator type; -}; - -// Make a checked iterator to avoid warnings on MSVC. -template -inline stdext::checked_array_iterator make_checked(T* p, std::size_t size) { +// Make a checked iterator to avoid MSVC warnings. +template using checked_ptr = stdext::checked_array_iterator; +template checked_ptr make_checked(T* p, std::size_t size) { return {p, size}; } #else -template struct checked { typedef T* type; }; +template using checked_ptr = T*; template inline T* make_checked(T* p, std::size_t) { return p; } #endif @@ -487,7 +483,7 @@ inline typename Container::value_type* get_data(Container& c) { } template ::value)> -inline typename checked::type reserve( +inline checked_ptr reserve( std::back_insert_iterator& it, std::size_t n) { Container& c = internal::get_container(it); std::size_t size = c.size();