External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automatically disable XPath when either PUGIXML_NO_STL or PUGIXML_NO_EXCEPTIONS is defined

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@524 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine 2010-06-16 07:48:45 +00:00
parent 4394a588c2
commit 7b419ad9ec
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pugiconfig.hpp
View File

@ -17,12 +17,13 @@
// Uncomment this to enable wchar_t mode // Uncomment this to enable wchar_t mode
// #define PUGIXML_WCHAR_MODE // #define PUGIXML_WCHAR_MODE
// Uncomment this to disable STL
// #define PUGIXML_NO_STL
// Uncomment this to disable XPath // Uncomment this to disable XPath
// #define PUGIXML_NO_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 // Uncomment this to disable exceptions
// Note: you can't use XPath with PUGIXML_NO_EXCEPTIONS // Note: you can't use XPath with PUGIXML_NO_EXCEPTIONS
// #define PUGIXML_NO_EXCEPTIONS // #define PUGIXML_NO_EXCEPTIONS

4
src/pugixml.cpp
View File

@ -17,10 +17,6 @@
#include "pugixml.hpp" #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 <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

6
src/pugixml.hpp
View File

@ -56,11 +56,9 @@ namespace std
# endif # endif
#endif #endif
// No XPath without STL // No XPath without STL or exceptions
#ifdef PUGIXML_NO_STL #if (defined(PUGIXML_NO_STL) || defined(PUGIXML_NO_EXCEPTIONS)) && !defined(PUGIXML_NO_XPATH)
# ifndef PUGIXML_NO_XPATH
# define PUGIXML_NO_XPATH # define PUGIXML_NO_XPATH
# endif
#endif #endif
// Include exception header for XPath // Include exception header for XPath