AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup checked iterators

Browse Source
This commit is contained in:
Victor Zverovich 2019-06-17 08:30:37 -07:00
parent 4912cff65d
commit fd2292f13a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/fmt/format.h
View File

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