Merge schema validators into one suite.

[shibboleth/cpp-xmltooling.git] / xmltooling / soap / impl / SOAPSchemaValidators.cpp

diff --git a/xmltooling/soap/impl/SOAPSchemaValidators.cpp b/xmltooling/soap/impl/SOAPSchemaValidators.cpp
index bd4f71e..88bd5ed 100644 (file)
--- a/xmltooling/soap/impl/SOAPSchemaValidators.cpp
+++ b/xmltooling/soap/impl/SOAPSchemaValidators.cpp
@@ -51,12 +51,12 @@ namespace {
 #define REGISTER_ELEMENT(namespaceURI,cname) \
     q=QName(namespaceURI,cname::LOCAL_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    SOAPSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
     
 #define REGISTER_TYPE(namespaceURI,cname) \
     q=QName(namespaceURI,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder()); \
-    SOAPSchemaValidators.registerValidator(q,new cname##SchemaValidator())
+    SchemaValidators.registerValidator(q,new cname##SchemaValidator())
 
 #define REGISTER_ELEMENT_NOVAL(namespaceURI,cname) \
     q=QName(namespaceURI,cname::LOCAL_NAME); \
@@ -66,8 +66,6 @@ namespace {
     q=QName(namespaceURI,cname::TYPE_NAME); \
     XMLObjectBuilder::registerBuilder(q,new cname##Builder());
 
-ValidatorSuite soap11::SOAPSchemaValidators("SOAPSchemaValidators");
-
 void soap11::registerSOAPClasses()
 {
     QName q;