[svn] commit: r2247 - /branches/trac192/src/lib/datasrc/cache.cc

[BIND 10 source code commits]

Author: each
Date: Wed Jun 23 22:00:39 2010
New Revision: 2247

Log:
Changed "q" to "question"

Modified:
    branches/trac192/src/lib/datasrc/cache.cc

Modified: branches/trac192/src/lib/datasrc/cache.cc
==============================================================================
--- branches/trac192/src/lib/datasrc/cache.cc (original)
+++ branches/trac192/src/lib/datasrc/cache.cc Wed Jun 23 22:00:39 2010
@@ -107,7 +107,7 @@
     CacheNodePtr next;
 
     /// The \c Question (name/rrclass/rrtype) answered by this cache node
-    const isc::dns::Question q;
+    const isc::dns::Question question;
 
 private:
     // The cached RRset data
@@ -120,7 +120,7 @@
 // CacheNode constructor for a positive cache entry
 CacheNode::CacheNode(const RRsetPtr rrset, const uint32_t flags,
                      const time_t lifespan) :
-    q(Question(rrset->getName(), rrset->getClass(), rrset->getType()))
+    question(Question(rrset->getName(), rrset->getClass(), rrset->getType()))
 {
     const time_t now = time(NULL);
     expiry = now + lifespan;
@@ -136,7 +136,7 @@
                      const RRType& rrtype,
                      const uint32_t flags,
                      const time_t lifespan) :
-    q(Question(name, rrclass, rrtype))
+    question(Question(name, rrclass, rrtype))
 {
     const time_t now = time(NULL);
     expiry = now + lifespan;
@@ -215,7 +215,7 @@
 inline void
 HotCacheImpl::insert(const CacheNodePtr node) {
     std::map<Question, CacheNodePtr>::const_iterator iter;
-    iter = map_.find(node->q);
+    iter = map_.find(node->question);
     if (iter != map_.end()) {
         CacheNodePtr old = iter->second;
         if (old && old->isValid()) {
@@ -233,7 +233,7 @@
         lru_tail_ = node;
     }
 
-    map_[node->q] = node;
+    map_[node->question] = node;
     ++count_;
 
     if (slots_ != 0 && count_ > slots_ && lru_tail_) {
@@ -291,7 +291,7 @@
         node->prev->next = node->next;
     }
 
-    map_.erase(node->q);
+    map_.erase(node->question);
     --count_;
 }