From 7b419ad9ecc9ff3056102a265a141863e168cd14 Mon Sep 17 00:00:00 2001
From: "arseny.kapoulkine"
 <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>
Date: Wed, 16 Jun 2010 07:48:45 +0000
Subject: Automatically disable XPath when either PUGIXML_NO_STL or
 PUGIXML_NO_EXCEPTIONS is defined

git-svn-id: http://pugixml.googlecode.com/svn/trunk@524 99668b35-9821-0410-8761-19e4c4f06640
---
 src/pugixml.hpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/pugixml.hpp')

diff --git a/src/pugixml.hpp b/src/pugixml.hpp
index 04d70d4..6861c08 100644
--- a/src/pugixml.hpp
+++ b/src/pugixml.hpp
@@ -56,11 +56,9 @@ namespace std
 #	endif
 #endif
 
-// No XPath without STL
-#ifdef PUGIXML_NO_STL
-#	ifndef PUGIXML_NO_XPATH
-#		define PUGIXML_NO_XPATH
-#	endif
+// No XPath without STL or exceptions
+#if (defined(PUGIXML_NO_STL) || defined(PUGIXML_NO_EXCEPTIONS)) && !defined(PUGIXML_NO_XPATH)
+#	define PUGIXML_NO_XPATH
 #endif
 
 // Include exception header for XPath
-- 
cgit v1.2.3