summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-06-16 07:48:45 +0000
committerarseny.kapoulkine <arseny.kapoulkine@99668b35-9821-0410-8761-19e4c4f06640>2010-06-16 07:48:45 +0000
commit7b419ad9ecc9ff3056102a265a141863e168cd14 (patch)
tree859292c7e22106044ae27fb2aa02fee92624d00c /src
parent4394a588c2d8f07b12201592054234cb321f37e5 (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')
-rw-r--r--src/pugiconfig.hpp7
-rw-r--r--src/pugixml.cpp4
-rw-r--r--src/pugixml.hpp8
3 files changed, 7 insertions, 12 deletions
diff --git a/src/pugiconfig.hpp b/src/pugiconfig.hpp
index ef55644..bc49895 100644
--- a/src/pugiconfig.hpp
+++ b/src/pugiconfig.hpp
@@ -17,12 +17,13 @@
// Uncomment this to enable wchar_t mode
// #define PUGIXML_WCHAR_MODE
-// Uncomment this to disable STL
-// #define PUGIXML_NO_STL
-
// Uncomment this to disable XPath
// #define PUGIXML_NO_XPATH
+// Uncomment this to disable STL
+// Note: you can't use XPath with PUGIXML_NO_STL
+// #define PUGIXML_NO_STL
+
// Uncomment this to disable exceptions
// Note: you can't use XPath with PUGIXML_NO_EXCEPTIONS
// #define PUGIXML_NO_EXCEPTIONS
diff --git a/src/pugixml.cpp b/src/pugixml.cpp
index 90023ea..3f871f1 100644
--- a/src/pugixml.cpp
+++ b/src/pugixml.cpp
@@ -17,10 +17,6 @@
#include "pugixml.hpp"
-#if !defined(PUGIXML_NO_XPATH) && defined(PUGIXML_NO_EXCEPTIONS)
-#error No exception mode can not be used with XPath support
-#endif
-
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
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