diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 19:17:38 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-15 19:17:38 +0000 |
| commit | 04fcec3e922bdcdaf789860beb1fffac39126ab4 (patch) | |
| tree | 742a19d8f710c09524133670ad19152a765d9b26 /third_party/tcmalloc | |
| parent | e5535031f06ae98a59ef181d154e5c504e03b3e4 (diff) | |
| download | chromium_src-04fcec3e922bdcdaf789860beb1fffac39126ab4.zip chromium_src-04fcec3e922bdcdaf789860beb1fffac39126ab4.tar.gz chromium_src-04fcec3e922bdcdaf789860beb1fffac39126ab4.tar.bz2 | |
Fixes for tcmalloc for VS2013
- Add missing #include of <algorithm> for std::min/max
- strtoll, strtoull, strotoq in runtime on >= VS2013.
R=jar@chromium.org
BUG=288948
Review URL: https://codereview.chromium.org/27017003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tcmalloc')
| -rw-r--r-- | third_party/tcmalloc/chromium/src/windows/port.cc | 1 | ||||
| -rw-r--r-- | third_party/tcmalloc/chromium/src/windows/port.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/third_party/tcmalloc/chromium/src/windows/port.cc b/third_party/tcmalloc/chromium/src/windows/port.cc index 0091985..690ab0b 100644 --- a/third_party/tcmalloc/chromium/src/windows/port.cc +++ b/third_party/tcmalloc/chromium/src/windows/port.cc @@ -41,6 +41,7 @@ #include <assert.h> #include <stdarg.h> // for va_list, va_start, va_end #include <windows.h> +#include <algorithm> #include "port.h" #include "base/logging.h" #include "base/spinlock.h" diff --git a/third_party/tcmalloc/chromium/src/windows/port.h b/third_party/tcmalloc/chromium/src/windows/port.h index c2381091..2b67522 100644 --- a/third_party/tcmalloc/chromium/src/windows/port.h +++ b/third_party/tcmalloc/chromium/src/windows/port.h @@ -433,6 +433,7 @@ inline int nanosleep(const struct timespec *req, struct timespec *rem) { } #ifndef __MINGW32__ +#if _MSC_VER < 1800 // Not required >= VS2013. inline long long int strtoll(const char *nptr, char **endptr, int base) { return _strtoi64(nptr, endptr, base); } @@ -443,6 +444,7 @@ inline unsigned long long int strtoull(const char *nptr, char **endptr, inline long long int strtoq(const char *nptr, char **endptr, int base) { return _strtoi64(nptr, endptr, base); } +#endif inline unsigned long long int strtouq(const char *nptr, char **endptr, int base) { return _strtoui64(nptr, endptr, base); |