[svn] commit: r645 - in /experiments/each-query/src/lib/auth/cpp: data_source.cc data_source.h data_source_static.cc data_source_static.h

[BIND 10 source code commits]

Author: each
Date: Fri Jan 29 19:24:51 2010
New Revision: 645

Log:
s/DataSrcPtr/DataSrc*/

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

Modified: experiments/each-query/src/lib/auth/cpp/data_source.cc
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source.cc (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source.cc Fri Jan 29 19:24:51 2010
@@ -15,7 +15,7 @@
     DSResult result;
     Name container("");
     RRsetList data, sigs;
-    DataSrcPtr ds = findClosestEnclosure(q.qname(), container);
+    DataSrc* ds = findClosestEnclosure(q.qname(), container);
 
     if (q.wantDnssec()) {
         result = ds->findRRset(q.qname(), q.qclass(), q.qtype(), data, sigs);

Modified: experiments/each-query/src/lib/auth/cpp/data_source.h
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source.h (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source.h Fri Jan 29 19:24:51 2010
@@ -33,8 +33,7 @@
     NAME_NOT_FOUND
 };
 
-class AbstractDataSrc;
-typedef AbstractDataSrc* DataSrcPtr;
+class DataSrc;
 
 class AbstractDataSrc {
 public:
@@ -57,8 +56,8 @@
                                const RRType& qtype,
                                RRsetList& target) = 0;
 
-    virtual DataSrcPtr findClosestEnclosure(const Name& qname,
-                                            Name& container) = 0;
+    virtual DataSrc* findClosestEnclosure(const Name& qname,
+                                          Name& container) = 0;
 
     // Optional 'low-level' methods.  These will have stub implementations
     // in the general DataSrc class but MAY be overwritten by subclasses
@@ -89,7 +88,7 @@
                                const RRType& qtype,
                                RRsetList& target) = 0;
 
-    virtual DataSrcPtr findClosestEnclosure(const Name& qname,
+    virtual DataSrc* findClosestEnclosure(const Name& qname,
                                             Name& container) = 0;
 
     RRClass& getClass() { return rrclass; }
@@ -108,7 +107,7 @@
     MetaDataSrc(const RRClass& c) : DataSrc(c) {}
     virtual ~MetaDataSrc() {}
 
-    void addDataSrc(DataSrcPtr ds) {
+    void addDataSrc(DataSrc* ds) {
         if (getClass() != RRClass::ANY() && ds->getClass() != getClass()) {
             dns_throw(Unexpected, "class mismatch");
         }
@@ -116,10 +115,10 @@
         data_sources.push_back(ds);
     };
 
-    DataSrcPtr findClosestEnclosure(const Name& qname, Name& container) {
-        DataSrcPtr best = NULL;
-        BOOST_FOREACH (DataSrcPtr ds, data_sources) {
-            DataSrcPtr source;
+    DataSrc* findClosestEnclosure(const Name& qname, Name& container) {
+        DataSrc* best = NULL;
+        BOOST_FOREACH (DataSrc* ds, data_sources) {
+            DataSrc* source;
             DSResult result;
 
             if (getClass() != RRClass::ANY() && ds->getClass() != getClass()) {
@@ -136,7 +135,7 @@
     };
 
 private:
-    std::vector<DataSrcPtr> data_sources;
+    std::vector<DataSrc*> data_sources;
 };
 
 }

Modified: experiments/each-query/src/lib/auth/cpp/data_source_static.cc
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source_static.cc (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source_static.cc Fri Jan 29 19:24:51 2010
@@ -29,7 +29,7 @@
     version->addRdata(rdata::generic::TXT("BIND10 0.0.0 (pre-alpha)"));
 }
 
-DataSrcPtr
+DataSrc*
 StaticDataSrc::findClosestEnclosure(const Name& qname, Name& container) {
     NameComparisonResult::NameRelation version_cmp = qname.compare(version_name).getRelation();
     if (version_cmp == NameComparisonResult::EQUAL ||

Modified: experiments/each-query/src/lib/auth/cpp/data_source_static.h
==============================================================================
--- experiments/each-query/src/lib/auth/cpp/data_source_static.h (original)
+++ experiments/each-query/src/lib/auth/cpp/data_source_static.h Fri Jan 29 19:24:51 2010
@@ -35,8 +35,8 @@
     StaticDataSrc();
     ~StaticDataSrc() {};
 
-    DataSrcPtr findClosestEnclosure(const Name& qname,
-                                    Name& container);
+    DataSrc* findClosestEnclosure(const Name& qname,
+                                  Name& container);
 
     DSResult findRRset(const Name& qname,
                        const RRClass& qclass,