Make hsStream typed readers and writers type-safe #871
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
This also makes the placement readers and writers type-safe. However, unfortunately the non-placement readers cannot be made type-safe since they return an element rather than accepting one as a parameter. For now, both styles are kept since both have their utility independently of each other.
Hoikas
approved these changes
Mar 13, 2021
| break; | ||
|
|
||
| case kFloat: | ||
| stream->ReadLE(&fFloatVal); | ||
| stream->ReadLEDouble(&fFloatVal); |
| for( ; i < kNumElements; i++ ) | ||
| for (uint32_t i = count; i < kNumElements; i++) | ||
| fElements[ i ].Empty(); |
There was a problem hiding this comment.
At some point, this needs to be cleaned up. Not in this PR, though.
| @@ -84,20 +84,20 @@ plFont::plCharacter::plCharacter() | |||
| void plFont::plCharacter::Read( hsStream *s ) | |||
| { | |||
| // Rocket science here... | |||
Comment on lines
+130
to
+142
| template <typename T> inline void ReadByte(T*) = delete; | ||
| void ReadByte(uint8_t* v) { *v = ReadByte(); } | ||
| void ReadByte(int8_t* v) { *v = (int8_t)ReadByte(); } | ||
| template <typename T> inline void ReadLE16(T*) = delete; | ||
| void ReadLE16(uint16_t* v) { *v = ReadLE16(); } | ||
| void ReadLE16(int16_t* v) { *v = (int16_t)ReadLE16(); } | ||
| template <typename T> inline void ReadLE32(T*) = delete; | ||
| void ReadLE32(uint32_t* v) { *v = ReadLE32(); } | ||
| void ReadLE32(int32_t* v) { *v = (int32_t)ReadLE32(); } | ||
| template <typename T> inline void ReadLEFloat(T*) = delete; | ||
| void ReadLEFloat(float* v) { *v = ReadLEFloat(); } | ||
| template <typename T> inline void ReadLEDouble(T*) = delete; | ||
| void ReadLEDouble(double* v) { *v = ReadLEDouble(); } |
There was a problem hiding this comment.
I wonder if these should be marked [[nodiscard]]? I'm assuming the reason for the (void) when reading and throwing away with (void)s->ReadLE32(); is to silence warnings about return values?
There was a problem hiding this comment.
Yeah, I actually did have [[nodiscard]] at one point (hence the (void) casts), but I later changed my mind... I could add them back in if preferred.
There was a problem hiding this comment.
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 should prevent future surprises when trying to change the type of a member variable which is also streamed, and also ensures compatibility with 64-bit builds.