[svn] commit: r590 - /experiments/each-query/src/lib/auth/cpp/query.h

[BIND 10 source code commits]

Author: each
Date: Thu Jan 28 19:42:05 2010
New Revision: 590

Log:
checkpoint

Modified:
    experiments/each-query/src/lib/auth/cpp/query.h

Modified: experiments/each-query/src/lib/auth/cpp/query.h
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/query.h (original)
+++ experiments/each-query/src/lib/auth/cpp/query.h Thu Jan 28 19:42:05 2010
@@ -42,7 +42,7 @@
 // An individual task to be carried out by the query logic
 class QueryTask {
 public:
-    QueryTask(Name& n, RRClass& c, RRType& t, SectionCode s) :
+    QueryTask(const Name& n, const RRClass& c, const RRType& t, SectionCode s) :
               qname(n), qclass(c), qtype(t)
     {
         section = s;
@@ -50,9 +50,9 @@
 
     virtual ~QueryTask();
 
-    Name& qname;
-    RRClass& qclass;
-    RRType& qtype;
+    const Name& qname;
+    const RRClass& qclass;
+    const RRType& qtype;
     SectionCode section;
 };
 
@@ -76,8 +76,7 @@
         qname_ = &query->getName();
         qclass_ = &query->getClass();
         qtype_ = &query->getType();
-        querytasks = new std::queue<QueryTask>;
-        querytasks.push(new QueryTask(qname_, qclass_, qtype_, answer));
+        querytasks.push(new QueryTask(*qname_, *qclass_, *qtype_, answer));
     };
 
     virtual ~Query() {}
@@ -93,12 +92,12 @@
     bool wantDnssec() { return want_dnssec; }
     void setWantDnssec(bool d) { want_dnssec = d; }
 
-    const Name& qname() { return qname_; }
-    const RRClass& qclass() { return qclass_; }
-    const RRType& qtype() { return qtype_; }
+    const Name& qname() { return *qname_; }
+    const RRClass& qclass() { return *qclass_; }
+    const RRType& qtype() { return *qtype_; }
 
     Message& message() { return *message_; }
-    std::queue<QueryTask>& tasks() { return querytasks; }
+    std::queue<QueryTask*>& tasks() { return querytasks; }
 
     QueryResult result() { return _result; }
 
@@ -111,7 +110,7 @@
     const RRType* qtype_;
 
     Message* message_;
-    std::queue<QueryTask> querytasks;
+    std::queue<QueryTask*> querytasks;
 
     bool want_additional;
     bool want_dnssec;