From f2ec36ab5fa04e11dee655d9c623baac95db1eba Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 13 Nov 2013 07:46:45 +0200
Subject: Drop support for Xerces-C++ 2-series

---
 .../cxx/tree/compression/compressed-format-target.cxx |  4 ----
 .../cxx/tree/compression/compressed-format-target.hxx |  4 ----
 .../cxx/tree/compression/compressed-input-source.cxx  | 19 -------------------
 .../cxx/tree/compression/compressed-input-source.hxx  | 10 ----------
 4 files changed, 37 deletions(-)

(limited to 'examples/cxx/tree/compression')

diff --git a/examples/cxx/tree/compression/compressed-format-target.cxx b/examples/cxx/tree/compression/compressed-format-target.cxx
index b4a8a85..61aeed3 100644
--- a/examples/cxx/tree/compression/compressed-format-target.cxx
+++ b/examples/cxx/tree/compression/compressed-format-target.cxx
@@ -81,11 +81,7 @@ compressed_format_target::
 
 void compressed_format_target::
 writeChars (const XMLByte* const buf,
-#if _XERCES_VERSION >= 30000
             const XMLSize_t size,
-#else
-            const unsigned int size,
-#endif
             xercesc::XMLFormatter* const)
 {
   // Flush the buffer if the block is too large or if we don't have
diff --git a/examples/cxx/tree/compression/compressed-format-target.hxx b/examples/cxx/tree/compression/compressed-format-target.hxx
index 5d12e81..fd1ef54 100644
--- a/examples/cxx/tree/compression/compressed-format-target.hxx
+++ b/examples/cxx/tree/compression/compressed-format-target.hxx
@@ -60,11 +60,7 @@ public:
 
   virtual void
   writeChars (const XMLByte* const buf,
-#if _XERCES_VERSION >= 30000
               const XMLSize_t size,
-#else
-              const unsigned int size,
-#endif
               xercesc::XMLFormatter* const);
 
   virtual void
diff --git a/examples/cxx/tree/compression/compressed-input-source.cxx b/examples/cxx/tree/compression/compressed-input-source.cxx
index 22d09ff..2107d59 100644
--- a/examples/cxx/tree/compression/compressed-input-source.cxx
+++ b/examples/cxx/tree/compression/compressed-input-source.cxx
@@ -111,27 +111,14 @@ compressed_input_stream::
   inflateEnd (&zs_);
 }
 
-#if _XERCES_VERSION >= 30000
 XMLFilePos compressed_input_stream::
 curPos () const
 {
   return static_cast<XMLFilePos> (pos_);
 }
-#else
-unsigned int compressed_input_stream::
-curPos () const
-{
-  return static_cast<unsigned int> (pos_);
-}
-#endif
 
-#if _XERCES_VERSION >= 30000
 XMLSize_t compressed_input_stream::
 readBytes (XMLByte* const buf, const XMLSize_t size)
-#else
-unsigned int compressed_input_stream::
-readBytes (XMLByte* const buf, const unsigned int size)
-#endif
 {
   if (end_)
     return 0;
@@ -169,20 +156,14 @@ readBytes (XMLByte* const buf, const unsigned int size)
   size_t n (size - zs_.avail_out);
   pos_ += n;
 
-#if _XERCES_VERSION >= 30000
   return static_cast<XMLSize_t> (n);
-#else
-  return static_cast<unsigned int> (n);
-#endif
 }
 
-#if _XERCES_VERSION >= 30000
 const XMLCh* compressed_input_stream::
 getContentType () const
 {
   return 0;
 }
-#endif
 
 size_t compressed_input_stream::
 read ()
diff --git a/examples/cxx/tree/compression/compressed-input-source.hxx b/examples/cxx/tree/compression/compressed-input-source.hxx
index 680d39f..74da9f1 100644
--- a/examples/cxx/tree/compression/compressed-input-source.hxx
+++ b/examples/cxx/tree/compression/compressed-input-source.hxx
@@ -96,7 +96,6 @@ public:
   virtual
   ~compressed_input_stream ();
 
-#if _XERCES_VERSION >= 30000
   virtual XMLFilePos
   curPos () const;
 
@@ -106,15 +105,6 @@ public:
   virtual const XMLCh*
   getContentType () const;
 
-#else
-
-  virtual unsigned int
-  readBytes (XMLByte* const buf, const unsigned int size);
-
-  virtual unsigned int
-  curPos () const;
-#endif
-
 private:
   std::size_t
   read ();
-- 
cgit v1.1