X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=xmltooling%2FAbstractElementProxy.h;h=ed95e53e4f0bc111d7a83c419339afe2cc6f8213;hp=b8bd05f09b7b15626672d4052585511dcdc53436;hb=77769b2e300d1295b8a5d717d9ede50e27d70cea;hpb=e0b407e9151cbd322a7f16c82ee40b1ce066d631

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