From 71795d41fdb96e41ec56e869e180f04bb5e66b7e Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 27 Jun 2010 09:21:58 +0100
Subject: [PATCH] Fixup Xerces callbacks

---
 include/IXMLParser.hpp | 4 ++--
 src/Map.cpp            | 2 +-
 src/XMLParser.cpp      | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/IXMLParser.hpp b/include/IXMLParser.hpp
index 83f02e3..4446431 100644
--- a/include/IXMLParser.hpp
+++ b/include/IXMLParser.hpp
@@ -134,7 +134,7 @@ struct IXMLCallback {
    virtual ~IXMLCallback() {}
 
    virtual void start_element(const string& local_name,
-                             const AttributeSet& attrs) {}
+                              const AttributeSet& attrs) {}
    virtual void end_element(const string& local_name) {}
    virtual void text(const string& local_name,
                      const string& a_string) {}
@@ -148,7 +148,7 @@ struct IXMLParser {
       IXMLCallback& a_callback) = 0;
 };
 
-typedef std::tr1::shared_ptr<IXMLParser> IXMLParserPtr;
+typedef shared_ptr<IXMLParser> IXMLParserPtr;
  
 IXMLParserPtr makeXMLParser(const std::string& a_schema_file);
      
diff --git a/src/Map.cpp b/src/Map.cpp
index ccffb0a..b7c3c25 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -1714,7 +1714,7 @@ private:
    Point<int> tile;
 
    IResourcePtr resource;
-}; 
+};
 
 IMapPtr load_map(const string& a_res_id)
 {
diff --git a/src/XMLParser.cpp b/src/XMLParser.cpp
index facb3b6..9f2e3cc 100644
--- a/src/XMLParser.cpp
+++ b/src/XMLParser.cpp
@@ -36,7 +36,7 @@ struct SAX2WrapperHandler : public DefaultHandler {
    
    SAX2WrapperHandler() : callback_ptr(NULL) {}
    
-   void start_element(const XMLCh* const uri,
+   void startElement(const XMLCh* const uri,
                      const XMLCh* const localname,
                      const XMLCh* const qname,
                      const Attributes& attrs)
@@ -57,7 +57,7 @@ struct SAX2WrapperHandler : public DefaultHandler {
       XMLString::release(&ch_buf);
    }
 
-   void end_element(const XMLCh* const uri,
+   void endElement(const XMLCh* const uri,
                    const XMLCh* const localname,
                    const XMLCh* const qname)
    {
@@ -74,7 +74,7 @@ struct SAX2WrapperHandler : public DefaultHandler {
    }
    
    void error(const SAXParseException& e) { throw e; }
-   void fatal_error(const SAXParseException& e) { throw e; }
+   void fatalError(const SAXParseException& e) { throw e; }
 
    IXMLCallback* callback_ptr;
    ostringstream char_buf;
-- 
2.39.2