X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltooling%2Futil%2FReplayCache.h;h=6c95ee7981756801ae00ae82052b0133bedcfc69;hb=81b488b2790e7bdeb2f43560b1d4a7d22c3dfdf5;hp=33f8725627916da091daeefd7252a71b6fb35205;hpb=5cb314df178f78c6fa7b9826c2c5a5298ec7a473;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltooling/util/ReplayCache.h b/xmltooling/util/ReplayCache.h
index 33f8725..6c95ee7 100644
--- a/xmltooling/util/ReplayCache.h
+++ b/xmltooling/util/ReplayCache.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.
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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.
  */
 
 /**
@@ -20,19 +24,21 @@
  * Helper class on top of StorageService for detecting message replay.
  */
 
-#ifndef __xmltooling_replay_h__
+#if !defined(__xmltooling_replay_h__) && !defined(XMLTOOLING_LITE)
 #define __xmltooling_replay_h__
 
-#include <xmltooling/util/StorageService.h>
+#include <xmltooling/base.h>
 
 namespace xmltooling {
 
+    class XMLTOOL_API StorageService;
+
     /**
      * Helper class on top of StorageService for detecting message replay.
      */
     class XMLTOOL_API ReplayCache
     {
-        MAKE_NONCOPYABLE(ReplayCache);
+    MAKE_NONCOPYABLE(ReplayCache);
     public:
         
         /**
@@ -41,9 +47,9 @@ namespace xmltooling {
          * The lifetime of the StorageService <strong>MUST</strong> be longer than
          * the lifetime of the ReplayCache.
          * 
-         * @param storage       pointer to a StorageService, or NULL to keep cache in memory
+         * @param storage       pointer to a StorageService, or nullptr to keep cache in memory
          */
-        ReplayCache(StorageService* storage=NULL);
+        ReplayCache(StorageService* storage=nullptr);
 
         virtual ~ReplayCache();
         
@@ -63,10 +69,7 @@ namespace xmltooling {
          * @param s         value to check
          * @param expires   time for disposal of value from cache
          */
-        bool check(const char* context, const XMLCh* s, time_t expires) {
-            auto_ptr_char temp(s);
-            return check(context, temp.get(), expires);
-        }
+        bool check(const char* context, const XMLCh* s, time_t expires);
         
     private:
         bool m_owned;