Skip to content

Commit

Permalink
Fix build references to deleted ServerHandlerImp: (XRPLF#4592)
Browse files Browse the repository at this point in the history
* Commits 0b812cd (XRPLF#4427) and 11e914f (XRPLF#4516) conflict. The first added
  references to `ServerHandlerImp` in files outside of that class's
  organizational unit (which is technically incorrect). The second
  removed `ServerHandlerImp`, but was not up to date with develop. This
  results in the build failing.
* Fixes the build by changing references to `ServerHandlerImp` to
  the more correct `ServerHandler`.
  • Loading branch information
ximinez authored and ckeshava committed Sep 22, 2023
1 parent 428c0e2 commit 384b5ab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/ripple/app/main/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ class ApplicationImp : public Application, public BasicApp
return *m_networkOPs;
}

virtual ServerHandlerImp&
virtual ServerHandler&
getServerHandler() override
{
assert(serverHandler_);
Expand Down
4 changes: 2 additions & 2 deletions src/ripple/app/main/Application.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class Overlay;
class PathRequests;
class PendingSaves;
class PublicKey;
class ServerHandlerImp;
class ServerHandler;
class SecretKey;
class STLedgerEntry;
class TimeKeeper;
Expand Down Expand Up @@ -232,7 +232,7 @@ class Application : public beast::PropertyStream::Source
getOPs() = 0;
virtual OrderBookDB&
getOrderBookDB() = 0;
virtual ServerHandlerImp&
virtual ServerHandler&
getServerHandler() = 0;
virtual TransactionMaster&
getMasterTransaction() = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/ripple/app/misc/NetworkOPs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
#include <ripple/resource/ResourceManager.h>
#include <ripple/rpc/BookChanges.h>
#include <ripple/rpc/DeliveredAmount.h>
#include <ripple/rpc/ServerHandler.h>
#include <ripple/rpc/impl/RPCHelpers.h>
#include <ripple/rpc/impl/ServerHandlerImp.h>
#include <boost/asio/ip/host_name.hpp>
#include <boost/asio/steady_timer.hpp>

Expand Down

0 comments on commit 384b5ab

Please sign in to comment.