Browse Source

[trac749] update placeholder scripts

chenzhengzhang 14 years ago
parent
commit
ff81e1bf77

+ 2 - 2
src/lib/dns/edns.cc

@@ -144,8 +144,8 @@ EDNS::toWire(MessageRenderer& renderer, const uint8_t extended_rcode) const {
 }
 
 unsigned int
-EDNS::toWire(OutputBuffer& buffer, const uint8_t extended_rcode) const {
-    return (toWire<OutputBuffer>(buffer, extended_rcode));
+EDNS::toWire(isc::util::io::OutputBuffer& buffer, const uint8_t extended_rcode) const {
+    return (toWire<isc::util::io::OutputBuffer>(buffer, extended_rcode));
 }
 
 EDNS*

+ 3 - 3
src/lib/dns/rdata.cc

@@ -54,7 +54,7 @@ createRdata(const RRType& rrtype, const RRClass& rrclass,
 
 RdataPtr
 createRdata(const RRType& rrtype, const RRClass& rrclass,
-            InputBuffer& buffer, size_t len)
+            isc::util::io::InputBuffer& buffer, size_t len)
 {
     if (len > MAX_RDLENGTH) {
         isc_throw(InvalidRdataLength, "RDLENGTH too large");
@@ -105,7 +105,7 @@ struct GenericImpl {
     vector<uint8_t> data_;
 };
 
-Generic::Generic(InputBuffer& buffer, size_t rdata_len) {
+Generic::Generic(isc::util::io::InputBuffer& buffer, size_t rdata_len) {
     if (rdata_len > MAX_RDLENGTH) {
         isc_throw(InvalidRdataLength, "RDLENGTH too large");
     }
@@ -224,7 +224,7 @@ Generic::toText() const {
 }
 
 void
-Generic::toWire(OutputBuffer& buffer) const {
+Generic::toWire(isc::util::io::OutputBuffer& buffer) const {
     buffer.writeData(&impl_->data_[0], impl_->data_.size());
 }
 

+ 1 - 1
src/lib/dns/rdata/generic/nsec3_50.cc

@@ -38,7 +38,7 @@
 
 using namespace std;
 using namespace isc::dns::rdata::generic::detail::nsec;
-using namespace isc::util::comapt;
+using namespace isc::util::compat;
 using namespace isc::util::io;
 
 // BEGIN_ISC_NAMESPACE

+ 9 - 4
src/lib/dns/rrclass-placeholder.h

@@ -23,11 +23,16 @@
 #include <exceptions/exceptions.h>
 
 namespace isc {
+namespace util {
+namespace io {
+class InputBuffer;
+class OutputBuffer;
+}
+}
+
 namespace dns {
 
 // forward declarations
-class InputBuffer;
-class OutputBuffer;
 class MessageRenderer;
 
 ///
@@ -132,7 +137,7 @@ public:
     /// an exception of class \c IncompleteRRClass will be thrown.
     ///
     /// \param buffer A buffer storing the wire format data.
-    explicit RRClass(InputBuffer& buffer);
+    explicit RRClass(isc::util::io::InputBuffer& buffer);
     ///
     /// We use the default copy constructor intentionally.
     //@}
@@ -177,7 +182,7 @@ public:
     ///
     /// \param renderer DNS message rendering context that encapsulates the
     /// output buffer in which the RRClass is to be stored.
-    void toWire(OutputBuffer& buffer) const;
+    void toWire(isc::util::io::OutputBuffer& buffer) const;
     //@}
 
     ///

+ 1 - 0
src/lib/dns/rrparamregistry-placeholder.cc

@@ -36,6 +36,7 @@
 using namespace std;
 using namespace boost;
 
+using namespace isc::util::io;
 using namespace isc::dns::rdata; 
 
 namespace isc {

+ 9 - 4
src/lib/dns/rrtype-placeholder.h

@@ -23,11 +23,16 @@
 #include <exceptions/exceptions.h>
 
 namespace isc {
+namespace util {
+namespace io {
+class InputBuffer;
+class OutputBuffer;
+}
+}
+
 namespace dns {
 
 // forward declarations
-class InputBuffer;
-class OutputBuffer;
 class MessageRenderer;
 
 ///
@@ -145,7 +150,7 @@ public:
     /// an exception of class \c IncompleteRRType will be thrown.
     ///
     /// \param buffer A buffer storing the wire format data.
-    explicit RRType(InputBuffer& buffer);
+    explicit RRType(isc::util::io::InputBuffer& buffer);
     ///
     /// We use the default copy constructor intentionally.
     //@}
@@ -189,7 +194,7 @@ public:
     ///
     /// \param renderer DNS message rendering context that encapsulates the
     /// output buffer in which the RRType is to be stored.
-    void toWire(OutputBuffer& buffer) const;
+    void toWire(isc::util::io::OutputBuffer& buffer) const;
     //@}
 
     ///