From 407a43aea933f108117d8935ea33aaffff9b819e Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Wed, 1 May 2013 22:22:51 -0700 Subject: [PATCH] Change shared_polymorphic_downcast to dynamic_pointer_cast. --- src/cpp/ripple/LedgerAcquire.cpp | 3 ++- src/cpp/ripple/RPCHandler.cpp | 3 ++- src/cpp/ripple/TransactionAcquire.cpp | 3 ++- src/cpp/ripple/WSConnection.h | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cpp/ripple/LedgerAcquire.cpp b/src/cpp/ripple/LedgerAcquire.cpp index fb4697fc51..272ae86c46 100644 --- a/src/cpp/ripple/LedgerAcquire.cpp +++ b/src/cpp/ripple/LedgerAcquire.cpp @@ -3,6 +3,7 @@ #include #include +#include #include "Application.h" #include "Log.h" @@ -279,7 +280,7 @@ void LedgerAcquire::addPeers() boost::weak_ptr LedgerAcquire::pmDowncast() { - return boost::shared_polymorphic_downcast(shared_from_this()); + return boost::dynamic_pointer_cast(shared_from_this()); } static void LADispatch( diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp index e5af79c75a..a24e49cc3f 100644 --- a/src/cpp/ripple/RPCHandler.cpp +++ b/src/cpp/ripple/RPCHandler.cpp @@ -6,6 +6,7 @@ #include #include +#include #include "Pathfinder.h" #include "Log.h" @@ -2767,7 +2768,7 @@ Json::Value RPCHandler::doSubscribe(Json::Value jvRequest, int& cost, ScopedLock cLog(lsDEBUG) << boost::str(boost::format("doSubscribe: building: %s") % strUrl); RPCSub::pointer rspSub = boost::make_shared(strUrl, strUsername, strPassword); - ispSub = mNetOps->addRpcSub(strUrl, boost::shared_polymorphic_downcast(rspSub)); + ispSub = mNetOps->addRpcSub(strUrl, boost::dynamic_pointer_cast(rspSub)); } else { diff --git a/src/cpp/ripple/TransactionAcquire.cpp b/src/cpp/ripple/TransactionAcquire.cpp index fb432afaf4..c5d3c070c8 100644 --- a/src/cpp/ripple/TransactionAcquire.cpp +++ b/src/cpp/ripple/TransactionAcquire.cpp @@ -4,6 +4,7 @@ #include #include #include +#include #include "../json/writer.h" @@ -92,7 +93,7 @@ void TransactionAcquire::onTimer(bool progress) boost::weak_ptr TransactionAcquire::pmDowncast() { - return boost::shared_polymorphic_downcast(shared_from_this()); + return boost::dynamic_pointer_cast(shared_from_this()); } void TransactionAcquire::trigger(Peer::ref peer) diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h index 060e538c1e..ca9f64987a 100644 --- a/src/cpp/ripple/WSConnection.h +++ b/src/cpp/ripple/WSConnection.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "WSDoor.h" #include "Application.h" @@ -126,7 +127,7 @@ public: } int cost = 10; - RPCHandler mRPCHandler(&mNetwork, boost::shared_polymorphic_downcast(this->shared_from_this())); + RPCHandler mRPCHandler(&mNetwork, boost::dynamic_pointer_cast(this->shared_from_this())); Json::Value jvResult(Json::objectValue); int iRole = mHandler->getPublic()