Undone an out-of-scope change and added a missing 'auto'

diff --git a/src/HappyConnOpener.cc b/src/HappyConnOpener.cc
index f27ee7050fc45c5e6247bae5da70684e9da94602..0436e35b6fea36d916d4d3e0bf18e46e069d56ac 100644 (file)
--- a/src/HappyConnOpener.cc
+++ b/src/HappyConnOpener.cc
@@ -574,7 +574,7 @@ HappyConnOpener::openFreshConnection(Attempt &attempt, PeerConnectionPointer &de
     AsyncCall::Pointer callConnect = asyncCall(48, 5, attempt.callbackMethodName,
                                      Dialer(this, attempt.callbackMethod));
     const time_t connTimeout = dest->connectTimeout(fwdStart);
-    Comm::ConnOpener *cs = new Comm::ConnOpener(conn, callConnect, connTimeout);
+    auto cs = new Comm::ConnOpener(conn, callConnect, connTimeout);
     if (!conn->getPeer())
         cs->setHost(host_);
 

diff --git a/src/security/BlindPeerConnector.h b/src/security/BlindPeerConnector.h
index 35f1aec00a82095aa15187a7e15215e29454fcf1..1710a66918f4643094d9c0d01094b7ceaaa9f619 100644 (file)
--- a/src/security/BlindPeerConnector.h
+++ b/src/security/BlindPeerConnector.h
@@ -20,8 +20,6 @@ namespace Security
 class BlindPeerConnector: public Security::PeerConnector {
     CBDATA_CLASS(BlindPeerConnector);
 public:
-    typedef CbcPointer<BlindPeerConnector> Pointer;
-
     BlindPeerConnector(HttpRequestPointer &aRequest,
                        const Comm::ConnectionPointer &aServerConn,
                        AsyncCall::Pointer &aCallback,