Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update mscorlib declaration #1862

Merged
merged 2 commits into from
Mar 19, 2021
Merged

Update mscorlib declaration #1862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
171f2c1
Update mscorlib declaration
josesimoes Mar 19, 2021
e1fc3e0
Merge branch 'develop' into update-mscorlib
josesimoes Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMake/Modules/FindNF_CoreCLR.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ set(NF_CoreCLR_SRCS
corlib_native_System_Attribute.cpp
corlib_native_System_BitConverter.cpp
corlib_native_System_Collections_ArrayList.cpp
corlib_native_System_Console.cpp
corlib_native_System_Convert.cpp
corlib_native_System_DateTime.cpp
corlib_native_System_Delegate.cpp
Expand Down
1 change: 0 additions & 1 deletion src/CLR/CorLib/CorLib.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<ClCompile Include="corlib_native_System_Attribute.cpp" />
<ClCompile Include="corlib_native_System_BitConverter.cpp" />
<ClCompile Include="corlib_native_System_Collections_ArrayList.cpp" />
<ClCompile Include="corlib_native_System_Console.cpp" />
<ClCompile Include="corlib_native_System_Convert.cpp" />
<ClCompile Include="corlib_native_System_DateTime.cpp" />
<ClCompile Include="corlib_native_System_Delegate.cpp" />
Expand Down
3 changes: 0 additions & 3 deletions src/CLR/CorLib/CorLib.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,6 @@
<ClCompile Include="corlib_native.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_Console.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="corlib_native_System_MathInternal.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down
8 changes: 3 additions & 5 deletions src/CLR/CorLib/corlib_native.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
Library_corlib_native_System_Collections_ArrayList::SetCapacity___VOID__I4,
NULL,
NULL,
Library_corlib_native_System_Console::OutNative___STATIC__VOID__STRING__BOOLEAN,
NULL,
NULL,
NULL,
Expand Down Expand Up @@ -1047,7 +1046,6 @@ static const CLR_RT_MethodHandler method_lookup[] =
Library_corlib_native_System_Collections_ArrayList::SetCapacity___VOID__I4,
NULL,
NULL,
Library_corlib_native_System_Console::OutNative___STATIC__VOID__STRING__BOOLEAN,
NULL,
NULL,
NULL,
Expand Down Expand Up @@ -1469,18 +1467,18 @@ const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_mscorlib =

#if (NANOCLR_REFLECTION == TRUE)

0x859E7E8A,
0x7B586F51,

#elif (NANOCLR_REFLECTION == FALSE)

0xD4D76535,
0x670A0475,

#else
#error "NANOCLR_REFLECTION has to be define either TRUE or FALSE. Check the build options."
#endif

method_lookup,
{ 100, 5, 0, 5 }
{ 100, 5, 0, 6 }
};

// clang-format on
8 changes: 0 additions & 8 deletions src/CLR/CorLib/corlib_native.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,14 +463,6 @@ struct Library_corlib_native_System_ComponentModel_EditorBrowsableState
//--//
};

struct Library_corlib_native_System_Console
{

NANOCLR_NATIVE_DECLARE(OutNative___STATIC__VOID__STRING__BOOLEAN);

//--//
};

struct Library_corlib_native_System_Int64
{

Expand Down
24 changes: 0 additions & 24 deletions src/CLR/CorLib/corlib_native_System_Console.cpp
View file
Open in desktop

This file was deleted.