Commit 16f4a5e7 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'fix-exodus-msvc-warning'

88110b19 Merge branch 'upstream-exodusII' into HEAD
4e0e7b9d exodusII 2019-01-28 (b406f69b)
c38bbdd7 exodus: update to fix msvc warning about PRId64
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !5126
parents 6d88341e 88110b19
......@@ -8,7 +8,7 @@ readonly name="exodusII"
readonly ownership="Seacas Upstream <kwrobot@kitware.com>"
readonly subtree="ThirdParty/$name/vtk$name"
readonly repo="https://gitlab.kitware.com/third-party/seacas.git"
readonly tag="for/vtk-20190111-7.15f-master"
readonly tag="for/vtk-20190128-7.15f-master"
readonly paths="
packages/seacas/libraries/exodus/CMakeLists.vtk.txt
packages/seacas/libraries/exodus/cmake/exodus_config.h.in
......
......@@ -54,7 +54,7 @@
#endif
#endif
#ifdef _WIN32
#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER < 1900
#define PRId64 "I64d"
#else
#include <inttypes.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment