blob: 721a9f5a1bc75df9b8eb33179c1c3a6a3233ef40 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
$NetBSD: patch-pdns_resolver.cc,v 1.3 2014/12/10 14:50:09 fhajny Exp $
Limit inclusion of boost headers to only those necessary to avoid conflicting
types errors on Solaris.
Resolve boost symbol ambiguity.
--- pdns/resolver.cc.orig 2014-10-30 10:18:22.000000000 +0000
+++ pdns/resolver.cc
@@ -33,7 +33,7 @@
#include <cstring>
#include <string>
#include <vector>
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/erase.hpp>
#include "dns.hh"
#include "qtype.hh"
#include "tcpreceiver.hh"
@@ -286,12 +286,12 @@ bool Resolver::tryGetSOASerial(string* d
bool gotSOA=false;
BOOST_FOREACH(const MOADNSParser::answers_t::value_type& drc, mdp.d_answers) {
if(drc.first.d_type == QType::SOA) {
- shared_ptr<SOARecordContent> src=boost::dynamic_pointer_cast<SOARecordContent>(drc.first.d_content);
+ boost::shared_ptr<SOARecordContent> src=boost::dynamic_pointer_cast<SOARecordContent>(drc.first.d_content);
*theirSerial=src->d_st.serial;
gotSOA = true;
}
if(drc.first.d_type == QType::RRSIG) {
- shared_ptr<RRSIGRecordContent> rrc=boost::dynamic_pointer_cast<RRSIGRecordContent>(drc.first.d_content);
+ boost::shared_ptr<RRSIGRecordContent> rrc=boost::dynamic_pointer_cast<RRSIGRecordContent>(drc.first.d_content);
if(rrc->d_type == QType::SOA) {
*theirInception= std::max(*theirInception, rrc->d_siginception);
*theirExpire = std::max(*theirExpire, rrc->d_sigexpire);
@@ -396,7 +396,7 @@ AXFRRetriever::AXFRRetriever(const Combo
d_sock = -1;
try {
d_sock = makeQuerySocket(local, false); // make a TCP socket
- d_buf = shared_array<char>(new char[65536]);
+ d_buf = boost::shared_array<char>(new char[65536]);
d_remote = remote; // mostly for error reporting
this->connect();
d_soacount = 0;
@@ -490,7 +490,7 @@ int AXFRRetriever::getChunk(Resolver::re
checkTSIG = true;
if(answer.first.d_type == QType::TSIG) {
- shared_ptr<TSIGRecordContent> trc = boost::dynamic_pointer_cast<TSIGRecordContent>(answer.first.d_content);
+ boost::shared_ptr<TSIGRecordContent> trc = boost::dynamic_pointer_cast<TSIGRecordContent>(answer.first.d_content);
theirMac = trc->d_mac;
d_trc.d_time = trc->d_time;
checkTSIG = true;
|
