diff options
author | Jan Kotas <jkotas@microsoft.com> | 2019-06-04 15:38:47 -0700 |
---|---|---|
committer | Aaron Robinson <arobins@microsoft.com> | 2019-06-04 15:38:46 -0700 |
commit | c57822327a17408c44853ae1ce22d581b5047ab6 (patch) | |
tree | f9827443bc89e367e6bf1d16ba93fa77d4274672 /src/classlibnative | |
parent | e7ca330168c7e74f6ab77ae33ea536bfe3ffba15 (diff) | |
download | coreclr-c57822327a17408c44853ae1ce22d581b5047ab6.tar.gz coreclr-c57822327a17408c44853ae1ce22d581b5047ab6.tar.bz2 coreclr-c57822327a17408c44853ae1ce22d581b5047ab6.zip |
Synchronize managed and unmanaged Variant fields (#24951)
* Synchronize managed and unmanaged Variant fields
Fixes #24948
Diffstat (limited to 'src/classlibnative')
-rw-r--r-- | src/classlibnative/bcltype/variant.cpp | 71 | ||||
-rw-r--r-- | src/classlibnative/bcltype/variant.h | 10 |
2 files changed, 0 insertions, 81 deletions
diff --git a/src/classlibnative/bcltype/variant.cpp b/src/classlibnative/bcltype/variant.cpp index 892c5888a6..dfd6929a39 100644 --- a/src/classlibnative/bcltype/variant.cpp +++ b/src/classlibnative/bcltype/variant.cpp @@ -35,77 +35,6 @@ #define EnumU8 0x800000 #define EnumMask 0xF00000 -// -// Current Conversions -// - -FCIMPL1(float, COMVariant::GetR4FromVar, VariantData* var) -{ - CONTRACTL - { - FCALL_CHECK; - PRECONDITION(CheckPointer(var)); - } - CONTRACTL_END; - - INT32 val = var->GetDataAsInt32(); - return (float&)val; -} -FCIMPLEND - -FCIMPL1(double, COMVariant::GetR8FromVar, VariantData* var) -{ - CONTRACTL - { - FCALL_CHECK; - PRECONDITION(CheckPointer(var)); - } - CONTRACTL_END; - - INT64 val = var->GetDataAsInt64(); - return (double&)val; -} -FCIMPLEND - - -/*=================================SetFieldsR4================================== -** -==============================================================================*/ -FCIMPL2_IV(void, COMVariant::SetFieldsR4, VariantData* var, float val) -{ - CONTRACTL - { - FCALL_CHECK; - PRECONDITION(CheckPointer(var)); - } - CONTRACTL_END; - - INT64 tempData; - - tempData = *((INT32 *)(&val)); - var->SetData(&tempData); - var->SetType(CV_R4); -} -FCIMPLEND - - -/*=================================SetFieldsR8================================== -** -==============================================================================*/ -FCIMPL2_IV(void, COMVariant::SetFieldsR8, VariantData* var, double val) -{ - CONTRACTL - { - FCALL_CHECK; - PRECONDITION(CheckPointer(var)); - } - CONTRACTL_END; - - var->SetData((void *)(&val)); - var->SetType(CV_R8); -} -FCIMPLEND - /*===============================SetFieldsObject================================ ** diff --git a/src/classlibnative/bcltype/variant.h b/src/classlibnative/bcltype/variant.h index 0089693e23..6ec0fe4043 100644 --- a/src/classlibnative/bcltype/variant.h +++ b/src/classlibnative/bcltype/variant.h @@ -31,17 +31,7 @@ public: // Helper Routines // - // - // Initialization Methods - - static FCDECL2_IV(void, SetFieldsR4, VariantData* vThisRef, float val); - static FCDECL2_IV(void, SetFieldsR8, VariantData* vThisRef, double val); static FCDECL2(void, SetFieldsObject, VariantData* vThisRef, Object* vVal); - static FCDECL1(float, GetR4FromVar, VariantData* var); - static FCDECL1(double, GetR8FromVar, VariantData* var); - - static FCDECL0(void, InitVariant); - static FCDECL1(Object*, BoxEnum, VariantData* var); private: |