https://issues.shibboleth.net/jira/browse/CPPOST-69

[shibboleth/cpp-opensaml.git] / saml / RootObject.h

diff --git a/saml/RootObject.h b/saml/RootObject.h
index 5ce98ec..5db45cd 100644 (file)
--- a/saml/RootObject.h
+++ b/saml/RootObject.h
@@ -1,30 +1,37 @@
-/*
- *  Copyright 2001-2006 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.
  */
 
 /**
  * @file saml/RootObject.h
  * 
- * Base class for SAML objects at the root of core schemas 
+ * Base class for SAML objects at the root of core schemas.
  */
 
 #ifndef __saml_root_h__
 #define __saml_root_h__
 
 #include <saml/signature/SignableObject.h>
-#include <xmltooling/util/DateTime.h>
+
+namespace xmltooling {
+    class XMLTOOL_API DateTime;
+};
 
 namespace opensaml {
 
@@ -32,10 +39,10 @@ namespace opensaml {
      * Base class for SAML objects at the root of core schemas.
      * Root objects are signable, and have message identifiers and timestamps.
      */
-    class SAML_API RootObject : public virtual SignableObject
+    class SAML_API RootObject : public SignableObject
     {
     public:
-        virtual ~RootObject() {}
+        virtual ~RootObject();
 
         /**
          * Returns the unique SAML ID of the object.
@@ -59,7 +66,7 @@ namespace opensaml {
         virtual time_t getIssueInstantEpoch() const=0;
 
     protected:
-        RootObject() {}
+        RootObject();
     };
 
 };