diff options
| author | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-06-16 07:48:45 +0000 |
|---|---|---|
| committer | arseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640> | 2010-06-16 07:48:45 +0000 |
| commit | 7b419ad9ecc9ff3056102a265a141863e168cd14 (patch) | |
| tree | 859292c7e22106044ae27fb2aa02fee92624d00c /src/pugixml.hpp | |
| parent | 4394a588c2d8f07b12201592054234cb321f37e5 (diff) | |
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
Diffstat (limited to 'src/pugixml.hpp')
| -rw-r--r-- | src/pugixml.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
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
|