Remove Slice-to-C++ code generation for local Slice #1619
Merged
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
bernardnormier
commented
Dec 21, 2023
| // | ||
| // Ice version 3.7.10 | ||
| // | ||
| // <auto-generated> |
There was a problem hiding this comment.
This code is the old generated code. We need to clean it up in a follow-up PR.
| Ordered | ||
| } | ||
| /// Uniquely identifies TCP endpoints. | ||
| const short TCPEndpointType = 1; |
There was a problem hiding this comment.
The EndpointSelectionType enum is now in the EndpointSelectionType.ice file - a more appropriate name!
| @@ -20,7 +20,9 @@ | |||
|
|
|||
| #include <Ice/ObjectAdapterF.ice> | |||
| #include <Ice/ConnectionF.ice> | |||
| #include <Ice/Context.ice> | |||
There was a problem hiding this comment.
Both Context and OperationMode are non-local so can't be in the same file as local struct Current.
| // Copyright (c) ZeroC, Inc. All rights reserved. | ||
| // | ||
|
|
||
| #pragma once |
There was a problem hiding this comment.
Split IceBox.ice in Service.ice (local) and ServiceManager.ice (non-local).
bernardnormier
force-pushed
the
xlocalgen-cpp
branch
from
da61c2e
to
158364b
Compare
pepone
approved these changes
Dec 22, 2023
bernardnormier
force-pushed
the
xlocalgen-cpp
branch
from
c7f9bf9
to
fcfc762
Compare
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.
This PR removes the Slice-to-C++ code generated for local Slice definitions. With this update, slice2cpp no longer generates anything for local Slice.
This PR:
commits the generated code for local C++ definitions, usually as-is (to simplify reviews)
split a few shared Slice files (in ice/slice) that included both local and non-local definitions
See #1620.