Skip to content

Commit 6618434

Browse files
committed
Rename typedef for Void to disambiguate with TI SimpleLink SDK type
1 parent 9747a46 commit 6618434

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/CLR/Core/TypeSystem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ HRESULT CLR_RT_SignatureParser::Advance(Element &res)
598598
NANOCLR_SET_AND_LEAVE(S_OK);
599599

600600
case DATATYPE_VOID:
601-
res.Class = g_CLR_RT_WellKnownTypes.Void;
601+
res.Class = g_CLR_RT_WellKnownTypes.n_Void;
602602
NANOCLR_SET_AND_LEAVE(S_OK);
603603

604604
case DATATYPE_GENERICINST:
@@ -3983,7 +3983,7 @@ static const TypeIndexLookup c_TypeIndexLookup[] = {
39833983
TIL("System", "TimeSpan", TimeSpan),
39843984
TIL("System", "String", String),
39853985

3986-
TIL("System", "Void", Void),
3986+
TIL("System", "Void", n_Void),
39873987
TIL("System", "Object", Object),
39883988
TIL("System", "ValueType", ValueType),
39893989
TIL("System", "Enum", Enum),

src/CLR/Include/nanoCLR_Runtime.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1685,7 +1685,8 @@ struct CLR_RT_WellKnownTypes
16851685
CLR_RT_TypeDef_Index TimeSpan;
16861686
CLR_RT_TypeDef_Index String;
16871687

1688-
CLR_RT_TypeDef_Index Void;
1688+
// need this prefix to disambiguate type in TI plaform
1689+
CLR_RT_TypeDef_Index n_Void;
16891690
CLR_RT_TypeDef_Index Object;
16901691
CLR_RT_TypeDef_Index ValueType;
16911692
CLR_RT_TypeDef_Index Enum;

0 commit comments

Comments
 (0)