External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation when windows.h is included (issue 2)

Browse Source
This commit is contained in:
Victor Zverovich 2013-04-22 07:39:36 -07:00
parent c7f2c658a0
commit 6da2c53099
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
format.h
View File

@ -101,7 +101,7 @@ class Array {
template <typename T, std::size_t SIZE> template <typename T, std::size_t SIZE>
void Array<T, SIZE>::Grow(std::size_t size) { void Array<T, SIZE>::Grow(std::size_t size) {
capacity_ = std::max(size, capacity_ + capacity_ / 2); capacity_ = (std::max)(size, capacity_ + capacity_ / 2);
T *p = new T[capacity_]; T *p = new T[capacity_];
std::copy(ptr_, ptr_ + size_, p); std::copy(ptr_, ptr_ + size_, p);
if (ptr_ != data_) if (ptr_ != data_)
@ -657,7 +657,7 @@ void BasicWriter<Char>::FormatDouble(
std::size_t offset = buffer_.size(); std::size_t offset = buffer_.size();
unsigned width = spec.width(); unsigned width = spec.width();
if (sign) { if (sign) {
buffer_.reserve(buffer_.size() + std::max(width, 1u)); buffer_.reserve(buffer_.size() + (std::max)(width, 1u));
if (width > 0) if (width > 0)
--width; --width;
++offset; ++offset;