commit 8cc69b1037252e46883624efe239017dfdca5676
author Lei Zhang <thestig@chromium.org> Thu Apr 09 22:36:05 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Apr 09 22:36:05 2020 +0000
tree 9d1111bc670e051c0b901fd730a733a687f17351
parent 2aa0a4af40524b8613199e8730143ddb732b1688

Avoid a static_assert in FxAllocAllocator in MSVC debug mode.

Small fix for when the GN enable_iterator_debugging variable is set to
true.

Bug: pdfium:1510
Change-Id: Ie83db1addc796ca07dcc8ff6654581cd05015f34
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/68630
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

core/fxcrt/fx_memory_wrappers.h

diff --git a/core/fxcrt/fx_memory_wrappers.h b/core/fxcrt/fx_memory_wrappers.h
index 34ac63a..d7ccd89 100644
--- a/core/fxcrt/fx_memory_wrappers.h
+++ b/core/fxcrt/fx_memory_wrappers.h
@@ -23,8 +23,10 @@
 template <class T>
 struct FxAllocAllocator {
  public:
+#if !defined(COMPILER_MSVC) || defined(NDEBUG)
   static_assert(std::is_arithmetic<T>::value,
                 "Only numeric types allowed in this partition");
+#endif
 
   using value_type = T;
   using pointer = T*;