summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2017-03-29 22:02:39 -0400
committer GitHub <noreply@github.com>2017-03-29 22:02:39 -0400
commit4730f5cba6434d680d98bdb3c8cf5d1c21bc8a7b (patch)
treead460467503e364b1c36d5f9dcfa51684ed7bdde
parent04394053947aa17ace7479ba612ef2d9e1fb4b61 (diff)
parentb7adbf543894f3058cf5a5d192e786c9fa6bd885 (diff)
Merge pull request #2197 from dankan1890/quick_fix
VS fix. (nw)
-rw-r--r--3rdparty/bx/src/string.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/3rdparty/bx/src/string.cpp b/3rdparty/bx/src/string.cpp
index b39ae253984..03c47096d32 100644
--- a/3rdparty/bx/src/string.cpp
+++ b/3rdparty/bx/src/string.cpp
@@ -5,10 +5,14 @@
#include <bx/allocator.h>
#include <bx/hash.h>
+#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-overflow"
+#endif
#include <bx/readerwriter.h>
+#ifdef __GNUC__
#pragma GCC diagnostic pop
+#endif
#include <bx/string.h>
#if !BX_CRT_NONE