------------------------------------------------------------ revno: 13389 revision-id: chtsanti@users.sourceforge.net-20140430134139-xvtta7ezsd4836op parent: chtsanti@users.sourceforge.net-20140430105009-9mg0z550qabjlqoi committer: Christos Tsantilas branch nick: trunk timestamp: Wed 2014-04-30 16:41:39 +0300 message: Ssl::PeerConnector class part 2 Move "operator <<(std::ostream &, const Ssl::PeerConnectorAnswer&)" under the Ssl namespace to make clang compiler happy. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chtsanti@users.sourceforge.net-20140430134139-\ # xvtta7ezsd4836op # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 702140d84086e4805add320340219e1dfa998210 # timestamp: 2014-04-30 13:54:02 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: chtsanti@users.sourceforge.net-20140430105009-\ # 9mg0z550qabjlqoi # # Begin patch === modified file 'src/ssl/PeerConnector.cc' --- src/ssl/PeerConnector.cc 2014-04-25 13:38:22 +0000 +++ src/ssl/PeerConnector.cc 2014-04-30 13:41:39 +0000 @@ -539,7 +539,7 @@ } std::ostream & -operator <<(std::ostream &os, const Ssl::PeerConnectorAnswer &answer) +Ssl::operator <<(std::ostream &os, const Ssl::PeerConnectorAnswer &answer) { return os << answer.conn << ", " << answer.error; } === modified file 'src/ssl/PeerConnector.h' --- src/ssl/PeerConnector.h 2014-04-25 13:38:22 +0000 +++ src/ssl/PeerConnector.h 2014-04-30 13:41:39 +0000 @@ -163,8 +163,8 @@ CBDATA_CLASS2(PeerConnector); }; +std::ostream &operator <<(std::ostream &os, const Ssl::PeerConnectorAnswer &a); + } // namespace Ssl -std::ostream &operator <<(std::ostream &os, const Ssl::PeerConnectorAnswer &a); - #endif /* SQUID_PEER_CONNECTOR_H */