Merge branch '1.x' of ssh://authdev.it.ohio-state.edu/~scantor/git/cpp-xmltooling...

[shibboleth/cpp-xmltooling.git] / xmltooling / io / AbstractXMLObjectUnmarshaller.h

diff --git a/xmltooling/io/AbstractXMLObjectUnmarshaller.h b/xmltooling/io/AbstractXMLObjectUnmarshaller.h
index fc23c97..8f3ee27 100644 (file)
--- a/xmltooling/io/AbstractXMLObjectUnmarshaller.h
+++ b/xmltooling/io/AbstractXMLObjectUnmarshaller.h
@@ -1,17 +1,21 @@
-/*
-*  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.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -38,12 +42,12 @@ namespace xmltooling {
     class XMLTOOL_API AbstractXMLObjectUnmarshaller : public virtual AbstractXMLObject
     {
     public:
-        virtual ~AbstractXMLObjectUnmarshaller() {}
+        virtual ~AbstractXMLObjectUnmarshaller();
 
         XMLObject* unmarshall(xercesc::DOMElement* element, bool bindDocument=false);
             
     protected:
-        AbstractXMLObjectUnmarshaller() {}
+        AbstractXMLObjectUnmarshaller();
 
         /**
          * Unmarshalls the attributes from the given DOM Element into the XMLObject. If the attribute