Multi-line svn commit, see body.

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

diff --git a/xmltooling/AbstractElementProxy.h b/xmltooling/AbstractElementProxy.h
index b8bd05f..ed95e53 100644 (file)
--- a/xmltooling/AbstractElementProxy.h
+++ b/xmltooling/AbstractElementProxy.h
@@ -15,7 +15,7 @@
  */\r
 \r
 /**\r
- * @file AbstractElementProxy.h\r
+ * @file xmltooling/AbstractElementProxy.h\r
  * \r
  * AbstractXMLObject mixin that implements an open content model \r
  */\r
@@ -24,7 +24,6 @@
 #define __xmltooling_abseleproxy_h__\r
 \r
 #include <xmltooling/AbstractComplexElement.h>\r
-#include <xmltooling/AbstractSimpleElement.h>\r
 #include <xmltooling/ElementProxy.h>\r
 \r
 #if defined (_MSC_VER)\r
@@ -35,12 +34,11 @@
 namespace xmltooling {\r
 \r
     /**\r
-     * AbstractXMLObject mixin that implements an open content model.\r
-     * Inherit from this class to merge both simple and complex content\r
+     * AbstractXMLObject mixin that layers ElementProxy on top of a complex element.\r
+     * Inherit from this class to implement complex content\r
      * and expose the underlying child collection in read/write mode.\r
      */\r
-    class XMLTOOL_API AbstractElementProxy\r
-        : public virtual ElementProxy, public AbstractSimpleElement, public AbstractComplexElement\r
+    class XMLTOOL_API AbstractElementProxy : public virtual ElementProxy, public AbstractComplexElement\r
     {\r
     public:\r
         virtual ~AbstractElementProxy() {}\r
@@ -57,8 +55,7 @@ namespace xmltooling {
         AbstractElementProxy() {}\r
         \r
         /** Copy constructor. */\r
-        AbstractElementProxy(const AbstractElementProxy& src)\r
-            : AbstractXMLObject(src), AbstractSimpleElement(src) {}\r
+        AbstractElementProxy(const AbstractElementProxy& src) : AbstractXMLObject(src), AbstractComplexElement(src) {}\r
     };\r
     \r
 };\r