From 8286ac511144e4f17d34eac9affb97e50646344a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 23 Jul 2014 15:25:44 +0200
Subject: Imported Upstream version 4.0.0

---
 libxsd-frontend/xsd-frontend/schema-dom-parser.cxx | 25 +---------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

(limited to 'libxsd-frontend/xsd-frontend/schema-dom-parser.cxx')

diff --git a/libxsd-frontend/xsd-frontend/schema-dom-parser.cxx b/libxsd-frontend/xsd-frontend/schema-dom-parser.cxx
index 452980c..73a0f83 100644
--- a/libxsd-frontend/xsd-frontend/schema-dom-parser.cxx
+++ b/libxsd-frontend/xsd-frontend/schema-dom-parser.cxx
@@ -1,6 +1,5 @@
 // file      : xsd-frontend/schema-dom-parser.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #include <xsd-frontend/schema-dom-parser.hxx>
@@ -44,11 +43,7 @@ namespace XSDFrontend
                   const unsigned int url_id,
                   const XMLCh* const prefix,
                   const RefVectorOf<XMLAttr>& attributes,
-#if _XERCES_VERSION >= 30000
                   const XMLSize_t attr_count,
-#else
-                  const unsigned int attr_count,
-#endif
                   const bool empty,
                   const bool root)
     {
@@ -77,18 +72,8 @@ namespace XSDFrontend
       ReaderMgr::LastExtEntityInfo info;
       ((ReaderMgr*) fScanner->getLocator())->getLastExtEntityInfo(info);
 
-#if _XERCES_VERSION >= 30000
       unsigned long l (static_cast<unsigned long> (info.lineNumber));
       unsigned long c (static_cast<unsigned long> (info.colNumber));
-#else
-      unsigned long l (info.lineNumber == -1
-                       ? 0UL
-                       : static_cast<unsigned long> (info.lineNumber));
-
-      unsigned long c (info.colNumber == -1
-                       ? 0UL
-                       : static_cast<unsigned long> (info.colNumber));
-#endif
 
       fCurrentNode->setUserData (line_key, reinterpret_cast<void*> (l), 0);
       fCurrentNode->setUserData (column_key, reinterpret_cast<void*> (c), 0);
@@ -124,11 +109,7 @@ namespace XSDFrontend
 
     void SchemaDOMParser::
     docCharacters (const XMLCh* const s,
-#if _XERCES_VERSION >= 30000
                    const XMLSize_t length,
-#else
-                   const unsigned int length,
-#endif
                    const bool cdata)
     {
       // Ignore chars outside of content.
@@ -177,11 +158,7 @@ namespace XSDFrontend
 
     void SchemaDOMParser::
     ignorableWhitespace (const XMLCh* const s,
-#if _XERCES_VERSION >= 30000
                          const XMLSize_t length,
-#else
-                         const unsigned int length,
-#endif
                          const bool cdata)
     {
       // Ignore chars before the root element.
-- 
cgit v1.2.3