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

---
 examples/cxx/tree/embedded/xsdbin.cxx | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'examples/cxx/tree/embedded/xsdbin.cxx')

diff --git a/examples/cxx/tree/embedded/xsdbin.cxx b/examples/cxx/tree/embedded/xsdbin.cxx
index 0da307b..dc42fd6 100644
--- a/examples/cxx/tree/embedded/xsdbin.cxx
+++ b/examples/cxx/tree/embedded/xsdbin.cxx
@@ -28,11 +28,7 @@
 #include <xercesc/sax2/SAX2XMLReader.hpp>
 #include <xercesc/sax2/XMLReaderFactory.hpp>
 
-#if _XERCES_VERSION >= 30000
-#  include <xercesc/framework/XMLGrammarPoolImpl.hpp>
-#else
-#  include <xercesc/internal/XMLGrammarPoolImpl.hpp>
-#endif
+#include <xercesc/framework/XMLGrammarPoolImpl.hpp>
 
 using namespace std;
 using namespace xercesc;
@@ -490,17 +486,9 @@ handle (const SAXParseException& e, severity s)
   char* id (XMLString::transcode (xid));
   char* msg (XMLString::transcode (e.getMessage ()));
 
-  cerr << id << ":";
-
-#if _XERCES_VERSION >= 30000
-  cerr << e.getLineNumber () << ":" << e.getColumnNumber () << " ";
-#else
-  XMLSSize_t l (e.getLineNumber ());
-  XMLSSize_t c (e.getColumnNumber ());
-  cerr << (l == -1 ? 0 : l) << ":" << (c == -1 ? 0 : c) << " ";
-#endif
-
-  cerr << (s == s_warning ? "warning: " : "error: ") << msg << endl;
+  cerr << id << ":"
+       << e.getLineNumber () << ":" << e.getColumnNumber () << " "
+       << (s == s_warning ? "warning: " : "error: ") << msg << endl;
 
   XMLString::release (&id);
   XMLString::release (&msg);
-- 
cgit v1.1