More explicit casting, removed 64-bit overrides

project-chip · Jan 15, 2025 · ff84571 · ff84571
1 parent cc4583e
commit ff84571
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/app/AttributeValueEncoder.h b/src/app/AttributeValueEncoder.h
@@ -83,14 +83,14 @@ class AttributeValueEncoder
         //   - we should figure where the extra const override is used
         //   - we should try to avoid having such footguns. This list template-explosion seems
         //     dangerous for flash.
-        inline CHIP_ERROR Encode(uint64_t const & aArg) const { return Encode((uint64_t) aArg); }
-        inline CHIP_ERROR Encode(uint64_t & aArg) const { return Encode((uint64_t) aArg); }
-        inline CHIP_ERROR Encode(uint32_t const & aArg) const { return Encode((uint32_t) aArg); }
-        inline CHIP_ERROR Encode(uint32_t & aArg) const { return Encode((uint32_t) aArg); }
-        inline CHIP_ERROR Encode(uint16_t const & aArg) const { return Encode((uint16_t) aArg); }
-        inline CHIP_ERROR Encode(uint16_t & aArg) const { return Encode((uint16_t) aArg); }
-        inline CHIP_ERROR Encode(uint8_t const & aArg) const { return Encode((uint8_t) aArg); }
-        inline CHIP_ERROR Encode(uint8_t & aArg) const { return Encode((uint8_t) aArg); }
+        //
+        // This relies on TLV numbers always being encoded as 64-bit value
+        inline CHIP_ERROR Encode(uint32_t const & aArg) const { return Encode<uint64_t>(aArg); }
+        inline CHIP_ERROR Encode(uint32_t & aArg) const { return Encode<uint64_t>(aArg); }
+        inline CHIP_ERROR Encode(uint16_t const & aArg) const { return Encode<uint64_t>(aArg); }
+        inline CHIP_ERROR Encode(uint16_t & aArg) const { return Encode<uint64_t>(aArg); }
+        inline CHIP_ERROR Encode(uint8_t const & aArg) const { return Encode<uint64_t>(aArg); }
+        inline CHIP_ERROR Encode(uint8_t & aArg) const { return Encode<uint64_t>(aArg); }
 
     private:
         AttributeValueEncoder & mAttributeValueEncoder;