From 4f4c607715092259f3e1c895ad696fe20069ee29 Mon Sep 17 00:00:00 2001 From: Jaret Cantu Date: Sun, 9 Feb 2014 09:28:49 -0500 Subject: [PATCH 3/3] Enforce use stl Description: TinyXml is built with TIXML_USE_STL, so we have to enforce it when the include is used externally. Author: Felix Geyer --- Makefile | 2 +- tinyxml.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c45951f..40084fd 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ PROFILE := NO # TINYXML_USE_STL can be used to turn on STL support. NO, then STL # will not be used. YES will include the STL files. -TINYXML_USE_STL := NO +TINYXML_USE_STL := YES #**************************************************************************** diff --git a/tinyxml.h b/tinyxml.h index a3589e5..12a7750 100644 --- a/tinyxml.h +++ b/tinyxml.h @@ -26,6 +26,10 @@ distribution. #ifndef TINYXML_INCLUDED #define TINYXML_INCLUDED +#ifndef TIXML_USE_STL + #define TIXML_USE_STL +#endif + #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable : 4530 ) -- 2.0.0