diff options
author | Andrew Stitcher <astitcher@apache.org> | 2012-08-29 17:51:40 +0000 |
---|---|---|
committer | Andrew Stitcher <astitcher@apache.org> | 2012-08-29 17:51:40 +0000 |
commit | 013b0a371ddf80a06e8bd8c416f1d96e5e4c371a (patch) | |
tree | 2e81b1409ac553120109832597a4dafa8113d6e2 /cpp | |
parent | ea33c76dd2238e2bc960ad752128f883bd1e6e20 (diff) | |
download | qpid-python-013b0a371ddf80a06e8bd8c416f1d96e5e4c371a.tar.gz |
NO-JIRA: Remove obsolete and now unused code
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1378662 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/src/qpid/broker/windows/SslProtocolFactory.cpp | 13 | ||||
-rw-r--r-- | cpp/src/qpid/client/windows/SslConnector.cpp | 6 | ||||
-rw-r--r-- | cpp/src/qpid/sys/ProtocolFactory.h | 1 | ||||
-rw-r--r-- | cpp/src/qpid/sys/SslPlugin.cpp | 22 |
4 files changed, 0 insertions, 42 deletions
diff --git a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp b/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp index 420e04e832..ff177ba499 100644 --- a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp +++ b/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp @@ -103,7 +103,6 @@ class SslProtocolFactory : public qpid::sys::ProtocolFactory { ConnectFailedCallback failed); uint16_t getPort() const; - bool supports(const std::string& capability); private: void connectFailed(const qpid::sys::Socket&, @@ -337,16 +336,4 @@ void SslProtocolFactory::connect(sys::Poller::shared_ptr poller, this, _1, _2, _3)); } -namespace -{ -const std::string SSL = "ssl"; -} - -bool SslProtocolFactory::supports(const std::string& capability) -{ - std::string s = capability; - transform(s.begin(), s.end(), s.begin(), tolower); - return s == SSL; -} - }}} // namespace qpid::sys::windows diff --git a/cpp/src/qpid/client/windows/SslConnector.cpp b/cpp/src/qpid/client/windows/SslConnector.cpp index 2aa31e8202..d11a8285be 100644 --- a/cpp/src/qpid/client/windows/SslConnector.cpp +++ b/cpp/src/qpid/client/windows/SslConnector.cpp @@ -79,7 +79,6 @@ public: ConnectionImpl*); virtual void connect(const std::string& host, const std::string& port); virtual void connected(const Socket&); - unsigned int getSSF(); }; // Static constructor which registers connector here @@ -173,9 +172,4 @@ void SslConnector::connected(const Socket& s) { shim->start(poller); } -unsigned int SslConnector::getSSF() -{ - return shim->getSslKeySize(); -} - }}} // namespace qpid::client::windows diff --git a/cpp/src/qpid/sys/ProtocolFactory.h b/cpp/src/qpid/sys/ProtocolFactory.h index 4d198a92da..ed573bd2f6 100644 --- a/cpp/src/qpid/sys/ProtocolFactory.h +++ b/cpp/src/qpid/sys/ProtocolFactory.h @@ -45,7 +45,6 @@ class ProtocolFactory : public qpid::SharedObject<ProtocolFactory> const std::string& host, const std::string& port, ConnectionCodec::Factory* codec, ConnectFailedCallback failed) = 0; - virtual bool supports(const std::string& /*capability*/) { return false; } }; inline ProtocolFactory::~ProtocolFactory() {} diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/cpp/src/qpid/sys/SslPlugin.cpp index 069e97758e..5520320ef2 100644 --- a/cpp/src/qpid/sys/SslPlugin.cpp +++ b/cpp/src/qpid/sys/SslPlugin.cpp @@ -86,7 +86,6 @@ class SslProtocolFactoryTmpl : public ProtocolFactory { boost::function2<void, int, std::string> failed); uint16_t getPort() const; - bool supports(const std::string& capability); private: void established(Poller::shared_ptr, const Socket&, ConnectionCodec::Factory*, @@ -270,25 +269,4 @@ void SslProtocolFactoryTmpl<T>::connect( failed); } -namespace -{ -const std::string SSL = "ssl"; -} - -template <> -bool SslProtocolFactory::supports(const std::string& capability) -{ - std::string s = capability; - transform(s.begin(), s.end(), s.begin(), tolower); - return s == SSL; -} - -template <> -bool SslMuxProtocolFactory::supports(const std::string& capability) -{ - std::string s = capability; - transform(s.begin(), s.end(), s.begin(), tolower); - return s == SSL || s == "tcp"; -} - }} // namespace qpid::sys |