Fixing conversion warnings

nasa · Apr 30, 2024 · f594e75 · f594e75
1 parent 895297d
commit f594e75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Fw/Types/StringBase.cpp b/Fw/Types/StringBase.cpp
@@ -146,7 +146,7 @@ SerializeStatus StringBase::serialize(SerializeBufferBase& buffer, SizeType maxL
 
 SerializeStatus StringBase::deserialize(SerializeBufferBase& buffer) {
     // Get the max size of the deserialized string
-    const FwSizeType maxSize = this->maxLength();
+    const SizeType maxSize = this->maxLength();
     // Initial estimate of actual size is max size
     // This estimate is refined when calling the deserialize function below
     SizeType actualSize = maxSize;

diff --git a/Fw/Types/StringBase.hpp b/Fw/Types/StringBase.hpp
@@ -31,13 +31,13 @@ class StringBase : public Serializable {
     SizeType maxLength() const;
     //! Get the static serialized size of a string
     //! This is the max length of the string plus the size of the stored size
-    static constexpr FwSizeType STATIC_SERIALIZED_SIZE(FwSizeType maxLength  //!< The maximum string length
+    static constexpr SizeType STATIC_SERIALIZED_SIZE(SizeType maxLength  //!< The maximum string length
     ) {
         return sizeof(FwSizeStoreType) + maxLength;
     }
 
     //! Get the size of a null-terminated string buffer
-    static constexpr FwSizeType BUFFER_SIZE(FwSizeType maxLength  //!< The maximum string length
+    static constexpr SizeType BUFFER_SIZE(SizeType maxLength  //!< The maximum string length
     ) {
         // Reserve one byte for each character plus one for the null terminator
         return maxLength + 1;