Multi-line svn commit, see body.

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

diff --git a/xmltooling/AbstractXMLObject.h b/xmltooling/AbstractXMLObject.h
index 576a7d0..3b41d6d 100644 (file)
--- a/xmltooling/AbstractXMLObject.h
+++ b/xmltooling/AbstractXMLObject.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file AbstractXMLObject.h
+ * @file xmltooling/AbstractXMLObject.h
  * 
  * An abstract implementation of XMLObject.
  */
@@ -23,11 +23,10 @@
 #ifndef __xmltooling_abstractxmlobj_h__
 #define __xmltooling_abstractxmlobj_h__
 
+#include <xmltooling/logging.h>
 #include <xmltooling/XMLObject.h>
 #include <xmltooling/util/DateTime.h>
 
-#include <log4cpp/Category.hh>
-
 #if defined (_MSC_VER)
     #pragma warning( push )
     #pragma warning( disable : 4250 4251 )
@@ -47,8 +46,8 @@ namespace xmltooling {
     public:
         virtual ~AbstractXMLObject() {
             delete m_typeQname;
-            XMLString::release(&m_schemaLocation);
-            XMLString::release(&m_noNamespaceSchemaLocation);
+            xercesc::XMLString::release(&m_schemaLocation);
+            xercesc::XMLString::release(&m_noNamespaceSchemaLocation);
         }
 
         void detach();
@@ -195,7 +194,7 @@ namespace xmltooling {
         /**
          * Logging object.
          */
-        log4cpp::Category& m_log;
+        logging::Category& m_log;
 
         /**
          * Stores off xsi:schemaLocation attribute.