Skip to content

GitLab

Commit fa806957 authored by Sam Mikes's avatar Sam Mikes
Browse files

serialization #defines not visible to VS2013; add manually

parent aa6f6bd7
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
serialization/src/dtoa.cpp
View file @ fa806957
...@@ -222,6 +222,7 @@ extern void *MALLOC(size_t); ...@@ -222,6 +222,7 @@ extern void *MALLOC(size_t);
static double private_mem[PRIVATE_mem], *pmem_next = private_mem; static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
#endif #endif
#define IEEE_8087
#undef IEEE_Arith #undef IEEE_Arith
#undef Avoid_Underflow #undef Avoid_Underflow
#ifdef IEEE_MC68k #ifdef IEEE_MC68k
...@@ -293,7 +294,7 @@ extern "C" { ...@@ -293,7 +294,7 @@ extern "C" {
#endif #endif
#if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1 #if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined. #error Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
#endif #endif
typedef union { double d; ULong L[2]; } U; typedef union { double d; ULong L[2]; } U;
......
serialization/src/tinyxml.h
View file @ fa806957
...@@ -30,6 +30,7 @@ distribution. ...@@ -30,6 +30,7 @@ distribution.
#pragma warning( push ) #pragma warning( push )
#pragma warning( disable : 4530 ) #pragma warning( disable : 4530 )
#pragma warning( disable : 4786 ) #pragma warning( disable : 4786 )
#define TIXML_USE_STL
#endif #endif
#include <ctype.h> #include <ctype.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