diff options
| author | Jeremy Koritzinsky <jekoritz@microsoft.com> | 2019-05-24 13:20:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 13:20:23 -0700 |
| commit | 73217c884caeca4bcfbb9cc93ffe4c90db79cf7a (patch) | |
| tree | 45ee95e94186fab0fabe05bd1aa351567daa62ac /src/vm/mscorlib.h | |
| parent | 5894a0f4ecd7360dc25b1e01afb0120efceb7a11 (diff) | |
| download | coreclr-73217c884caeca4bcfbb9cc93ffe4c90db79cf7a.tar.gz coreclr-73217c884caeca4bcfbb9cc93ffe4c90db79cf7a.tar.bz2 coreclr-73217c884caeca4bcfbb9cc93ffe4c90db79cf7a.zip | |
Enable LCID marshalling and clean up our LCID marshalling tests. (#24642)
* Enable LCID marshalling and clean up our LCID marshalling tests.
* Fix return type.
* Enable LCID IDispatch reverse marshalling
* Add more tests for LCID marshalling.
* Add testing for reverse-IDispatch. Fix bug in Thread::GetCulture when culture has not been initialized on the managed side.
* PR Feedback.
* Fix install command.
Diffstat (limited to 'src/vm/mscorlib.h')
| -rw-r--r-- | src/vm/mscorlib.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/vm/mscorlib.h b/src/vm/mscorlib.h index 50188f0407..d328d2a471 100644 --- a/src/vm/mscorlib.h +++ b/src/vm/mscorlib.h @@ -272,10 +272,8 @@ DEFINE_CLASS(CULTURE_INFO, Globalization, CultureInfo) DEFINE_METHOD(CULTURE_INFO, STR_CTOR, .ctor, IM_Str_RetVoid) DEFINE_FIELD(CULTURE_INFO, CURRENT_CULTURE, s_userDefaultCulture) DEFINE_PROPERTY(CULTURE_INFO, NAME, Name, Str) -#ifdef FEATURE_USE_LCID DEFINE_METHOD(CULTURE_INFO, INT_CTOR, .ctor, IM_Int_RetVoid) DEFINE_PROPERTY(CULTURE_INFO, ID, LCID, Int) -#endif DEFINE_FIELD(CULTURE_INFO, CULTURE, s_currentThreadCulture) DEFINE_FIELD(CULTURE_INFO, UI_CULTURE, s_currentThreadUICulture) DEFINE_STATIC_SET_PROPERTY(CULTURE_INFO, CURRENT_CULTURE, CurrentCulture, CultureInfo) |