Add missing include, try disable warnings on MSVC.

This commit is contained in:
Victor Zverovich 2013-04-22 08:11:57 -07:00
parent 6da2c53099
commit ca7e689e08

View File

@ -36,6 +36,7 @@
#include <cstddef> #include <cstddef>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <algorithm>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#include <sstream> #include <sstream>
@ -99,6 +100,9 @@ class Array {
const T &operator[](std::size_t index) const { return ptr_[index]; } const T &operator[](std::size_t index) const { return ptr_[index]; }
}; };
#pragma warning(push)
#pragma warning(disable: 4996)
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);
@ -118,6 +122,8 @@ void Array<T, SIZE>::append(const T *begin, const T *end) {
size_ += num_elements; size_ += num_elements;
} }
#pragma warning(pop)
// Information about an integer type. // Information about an integer type.
// IntTraits is not specialized for integer types smaller than int, // IntTraits is not specialized for integer types smaller than int,
// since these are promoted to int. // since these are promoted to int.