diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2013-11-13 07:46:45 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2013-11-13 07:46:45 +0200 |
commit | f2ec36ab5fa04e11dee655d9c623baac95db1eba (patch) | |
tree | f1f51bc34e749ca1f97e2e722a334fc599c8a124 /libxsd/xsd/cxx/xml/sax/std-input-source.hxx | |
parent | 6e9a647a859d9a95c96e75c77beaf41b166cc4e4 (diff) |
Drop support for Xerces-C++ 2-series
Diffstat (limited to 'libxsd/xsd/cxx/xml/sax/std-input-source.hxx')
-rw-r--r-- | libxsd/xsd/cxx/xml/sax/std-input-source.hxx | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/libxsd/xsd/cxx/xml/sax/std-input-source.hxx b/libxsd/xsd/cxx/xml/sax/std-input-source.hxx index 6b0af98..6f3ee38 100644 --- a/libxsd/xsd/cxx/xml/sax/std-input-source.hxx +++ b/libxsd/xsd/cxx/xml/sax/std-input-source.hxx @@ -29,27 +29,14 @@ namespace xsd { } -#if _XERCES_VERSION >= 30000 virtual XMLFilePos curPos () const { return static_cast<XMLFilePos> (is_.tellg ()); } -#else - virtual unsigned int - curPos () const - { - return static_cast<unsigned int> (is_.tellg ()); - } -#endif -#if _XERCES_VERSION >= 30000 virtual XMLSize_t readBytes (XMLByte* const buf, const XMLSize_t size) -#else - virtual unsigned int - readBytes (XMLByte* const buf, const unsigned int size) -#endif { // Some implementations don't clear gcount if you // call read() on a stream that is in the eof state. @@ -78,25 +65,17 @@ namespace xsd // Make sure that if we failed, readBytes won't be called // again. // - if (!is_.fail ()) - { -#if _XERCES_VERSION >= 30000 - return static_cast<XMLSize_t> (is_.gcount ()); -#else - return static_cast<unsigned int> (is_.gcount ()); -#endif - } - else - return 0; + return !is_.fail () + ? static_cast<XMLSize_t> (is_.gcount ()) + : 0; } -#if _XERCES_VERSION >= 30000 virtual const XMLCh* getContentType () const { return 0; } -#endif + private: std::istream& is_; }; |