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

Different versions of RWSTL have different headers; revert the previous change and instead introduce PUGIXML_NO_STL_FWDDECL macro (that disables forward declaration of STL classes, which is not compliant).

Browse Source 
git-svn-id: http://pugixml.googlecode.com/svn/trunk@857 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
arseny.kapoulkine@gmail.com 2012-03-14 04:21:26 +00:00
parent cf779955d9
commit 23f891a92b
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pugiconfig.hpp
View File

@ -32,7 +32,7 @@
// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall // #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead // In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
// Header-only version // Uncomment this to switch to header-only version
// #define PUGIXML_HEADER_ONLY // #define PUGIXML_HEADER_ONLY
// #include "pugixml.cpp" // #include "pugixml.cpp"

14
src/pugixml.hpp
View File

@ -34,6 +34,11 @@
// cstddef is needed so that we get the 'std' namespace declaration (STLport sometimes makes std a define) // cstddef is needed so that we get the 'std' namespace declaration (STLport sometimes makes std a define)
# include <cstddef> # include <cstddef>
# if defined(PUGIXML_NO_STL_FWDDECL)
# include <iterator>
# include <iosfwd>
# include <string>
# else
// Forward declarations for STL classes to reduce include dependencies // Forward declarations for STL classes to reduce include dependencies
namespace std namespace std
{ {
@ -41,19 +46,11 @@ namespace std
#ifdef __SUNPRO_CC #ifdef __SUNPRO_CC
// Sun C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions // Sun C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions
# ifndef _STLPORT_VERSION
template <class T> class allocator;
template <class charT> struct char_traits;
template <class charT, class traits > class basic_istream;
template <class charT, class traits > class basic_ostream;
template <class charT, class traits, class Allocator> class basic_string;
# else
template <class _T> class allocator; template <class _T> class allocator;
template <class _charT> struct char_traits; template <class _charT> struct char_traits;
template <class _charT, class _Traits> class basic_istream; template <class _charT, class _Traits> class basic_istream;
template <class _charT, class _Traits> class basic_ostream; template <class _charT, class _Traits> class basic_ostream;
template <class _charT, class _Traits, class _Allocator> class basic_string; template <class _charT, class _Traits, class _Allocator> class basic_string;
# endif
#else #else
// Borland C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions // Borland C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions
template <class _Ty> class allocator; template <class _Ty> class allocator;
@ -77,6 +74,7 @@ namespace std
#endif #endif
} }
#endif #endif
#endif
// Macro for deprecated features // Macro for deprecated features
#ifndef PUGIXML_DEPRECATED #ifndef PUGIXML_DEPRECATED