--- a/servlib/bundling/BPQCache.h	Thu Sep 01 15:53:24 2011 +0100
+++ b/servlib/bundling/BPQCache.h	Wed Oct 05 13:52:40 2011 +0100
@@ -28,7 +28,7 @@
 namespace dtn {
 
 class BPQBlock;
-class FragmentState;
+class BPQCacheEntry;
 class EndpointID;
 class BPQResponse;
 
@@ -44,6 +44,8 @@
 
     /**
      * Try to answer a BPQ query with a response in the cache
+     * @return  true if the query was successfully answered in full
+     * 			false otherwise
      */
     bool answer_query(Bundle* bundle, BPQBlock* block);
 
@@ -74,7 +76,7 @@
     /**
      * Table of partial BPQ bundles
      */
-    typedef oasys::StringHashMap<FragmentState*> Cache;
+    typedef oasys::StringHashMap<BPQCacheEntry*> Cache;
     Cache bpq_table_;
 
 };