Multi-line svn commit, see body.

[shibboleth/cpp-xmltooling.git] / xmltooling / AbstractXMLObject.h

diff --git a/xmltooling/AbstractXMLObject.h b/xmltooling/AbstractXMLObject.h
index 80f3871..3b41d6d 100644 (file)
--- a/xmltooling/AbstractXMLObject.h
+++ b/xmltooling/AbstractXMLObject.h
@@ -1,5 +1,5 @@
 /*
-*  Copyright 2001-2006 Internet2
+*  Copyright 2001-2007 Internet2
  * 
 * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,15 @@
  */
 
 /**
- * @file AbstractXMLObject.h
+ * @file xmltooling/AbstractXMLObject.h
  * 
  * An abstract implementation of XMLObject.
  */
 
-#if !defined(__xmltooling_abstractxmlobj_h__)
+#ifndef __xmltooling_abstractxmlobj_h__
 #define __xmltooling_abstractxmlobj_h__
 
+#include <xmltooling/logging.h>
 #include <xmltooling/XMLObject.h>
 #include <xmltooling/util/DateTime.h>
 
@@ -45,7 +46,8 @@ namespace xmltooling {
     public:
         virtual ~AbstractXMLObject() {
             delete m_typeQname;
-            XMLString::release(&m_schemaLocation);
+            xercesc::XMLString::release(&m_schemaLocation);
+            xercesc::XMLString::release(&m_noNamespaceSchemaLocation);
         }
 
         void detach();
@@ -192,13 +194,18 @@ namespace xmltooling {
         /**
          * Logging object.
          */
-        void* m_log;
+        logging::Category& m_log;
 
         /**
          * Stores off xsi:schemaLocation attribute.
          */
         XMLCh* m_schemaLocation;
 
+        /**
+         * Stores off xsi:noNamespaceSchemaLocation attribute.
+         */
+        XMLCh* m_noNamespaceSchemaLocation;
+
     private:
         XMLObject* m_parent;
         QName m_elementQname;