diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-10-29 13:17:42 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-10-29 13:17:42 +0300 |
| commit | 8d50ec9705a71347d1371be9e7022f268738f1e6 (patch) | |
| tree | 7c519f3122b1df4759fcd88a7955278197029c56 /src/ObjectModel/ObjectModel.h | |
| parent | 9dfad056245fa2a202b1e18e6f03c3c9ce17d064 (diff) | |
Renamed TypeCode::UniqueId for eCv
Diffstat (limited to 'src/ObjectModel/ObjectModel.h')
| -rw-r--r-- | src/ObjectModel/ObjectModel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ObjectModel/ObjectModel.h b/src/ObjectModel/ObjectModel.h index 9ae99e80..a5109050 100644 --- a/src/ObjectModel/ObjectModel.h +++ b/src/ObjectModel/ObjectModel.h @@ -44,7 +44,7 @@ enum class TypeCode : uint8_t MacAddress_tc, // renamed for eCv to avoid clash with class MacAddress Special, Port, - UniqueId, + UniqueId_tc, #if SUPPORT_CAN_EXPANSION CanExpansionBoardDetails #endif @@ -143,7 +143,7 @@ struct ExpressionValue explicit ExpressionValue(SpecialType s, uint32_t u) noexcept : type((uint32_t)TypeCode::Special), param((uint32_t)s), uVal(u) { } explicit ExpressionValue(StringHandle h) noexcept : type((uint32_t)TypeCode::HeapString), param(0), shVal(h) { } explicit ExpressionValue(const IoPort& p) noexcept : type((uint32_t)TypeCode::Port), param(0), iopVal(&p) { } - explicit ExpressionValue(const UniqueId& id) noexcept : type((uint32_t)TypeCode::UniqueId), param(0), uniqueIdVal(&id) { } + explicit ExpressionValue(const UniqueId& id) noexcept : type((uint32_t)TypeCode::UniqueId_tc), param(0), uniqueIdVal(&id) { } #if SUPPORT_CAN_EXPANSION ExpressionValue(const char*s, ExpansionDetail p) noexcept : type((uint32_t)TypeCode::CanExpansionBoardDetails), param((uint32_t)p), sVal(s) { } #endif |