[Trivial] Fix build references to deleted ServerHandlerImp #4592
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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 in all circumstances. * Fixes the build by changing references to `ServerHandlerImp` to the more correct `ServerHandler`.
ximinez
changed the title
thejohnfreeman
approved these changes
Jun 28, 2023
ckeshava
reviewed
Jun 28, 2023
| @@ -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> | |||
There was a problem hiding this comment.
If we strictly follow the lexicographic order, shouldn't the import order be reversed?
alphabetically, S comes after i. While ordering the imports, are we keeping all the impl imports together?
There was a problem hiding this comment.
It depends on whether the lexicographic order is case insensitive or not. Lower case "i" comes after capital "S".
There was a problem hiding this comment.
okay, didn't think of that :)
ckeshava
approved these changes
Jun 28, 2023
scottschurr
reviewed
Jun 28, 2023
ckeshava
pushed a commit
to ckeshava/rippled
that referenced
this pull request
Jul 10, 2023
* 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`.
ckeshava
pushed a commit
to ckeshava/rippled
that referenced
this pull request
Sep 22, 2023
* 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`.
ckeshava
pushed a commit
to ckeshava/rippled
that referenced
this pull request
Sep 25, 2023
* 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`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
High Level Overview of Change
ServerHandlerImpto the more correctServerHandler.Context of Change
ServerHandlerImptoServerHandler#4516) conflict. The first added references toServerHandlerImpin files outside of that class's organizational unit (which is technically incorrect). The second removedServerHandlerImp, but was not up to date with develop. This results in the build failing in all circumstances.Type of Change
Before / After
Before:
rippleddoesn't build.After: It does.
Future Tasks
Dedicating resources to wiping out all of the levelization issues across the board would help with this kind of thing.