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

---
 libxsd/xsd/cxx/tree/types.txx | 65 +------------------------------------------
 1 file changed, 1 insertion(+), 64 deletions(-)

(limited to 'libxsd/xsd/cxx/tree/types.txx')

diff --git a/libxsd/xsd/cxx/tree/types.txx b/libxsd/xsd/cxx/tree/types.txx
index 1a59ed3..be893af 100644
--- a/libxsd/xsd/cxx/tree/types.txx
+++ b/libxsd/xsd/cxx/tree/types.txx
@@ -5,7 +5,6 @@
 
 #include <xercesc/util/Base64.hpp>
 #include <xercesc/util/XMLString.hpp>
-#include <xercesc/util/XercesVersion.hpp>
 
 #include <xsd/cxx/auto-array.hxx>
 
@@ -335,7 +334,6 @@ namespace xsd
         using xercesc::Base64;
         std::basic_string<C> str;
 
-#if _XERCES_VERSION >= 30000
         XMLSize_t n;
 
         xml::std_memory_manager mm;
@@ -359,31 +357,6 @@ namespace xsd
         {
           //@@ throw
         }
-#else
-        unsigned int n;
-
-        xml::std_memory_manager mm;
-        auto_array<XMLByte, xml::std_memory_manager> r (
-          Base64::encode (
-            reinterpret_cast<const XMLByte*> (this->data ()),
-            static_cast<unsigned int> (this->size ()),
-            &n,
-            &mm),
-	  mm);
-
-        if (r)
-        {
-          str.reserve (n + 1);
-          str.resize (n);
-
-          for (unsigned int i (0); i < n; ++i)
-            str[i] = C (r[i]);
-        }
-        else
-        {
-          //@@ throw
-        }
-#endif
 
         return str;
       }
@@ -397,23 +370,11 @@ namespace xsd
         using xercesc::Base64;
 
         xml::std_memory_manager mm;
-
-        // Xerces 2.6.0 and earlier do not have decodeToXMLByte which
-        // makes my life harder and your code slower.
-        //
-#if _XERCES_VERSION >= 20700
-
-#if _XERCES_VERSION >= 30000
         XMLSize_t size;
+
         auto_array<XMLByte, xml::std_memory_manager> data (
           Base64::decodeToXMLByte (src, &size, &mm, Base64::Conf_RFC2045),
 	  mm);
-#else
-        unsigned int size;
-        auto_array<XMLByte, xml::std_memory_manager> data (
-          Base64::decodeToXMLByte (src, &size, &mm, Base64::Conf_RFC2045),
-	  mm);
-#endif // _XERCES_VERSION >= 30000
 
         if (data)
         {
@@ -425,30 +386,6 @@ namespace xsd
         {
           //@@ throw
         }
-#else
-        unsigned int size;
-
-#if _XERCES_VERSION >= 20600  // Xerces 2.5.0 does not have Conf_RFC2045.
-        auto_array<XMLCh, xml::std_memory_manager> data (
-          Base64::decode (src, &size, &mm, Base64::Conf_RFC2045),
-	  mm);
-#else
-        auto_array<XMLCh, xml::std_memory_manager> data (
-          Base64::decode (src, &size, &mm), mm);
-#endif // _XERCES_VERSION >= 20600
-
-        if (data)
-        {
-          buffer<C> tmp (size);
-          for (unsigned int i (0); i < size; ++i)
-            tmp.data ()[i] = static_cast<char> (data[i]);
-          this->swap (tmp); // g++ 4.1 likes it qualified, not sure why.
-        }
-        else
-        {
-          //@@ throw
-        }
-#endif  //_XERCES_VERSION >= 20700
       }
 
 
-- 
cgit v1.1