Author: martin
Date: 2005-04-13 07:46:27 -0400 (Wed, 13 Apr 2005)
New Revision: 42912
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/attribute.cs
Log:
**** Merged r41289 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-13 11:45:28 UTC (rev 42911)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-13 11:46:27 UTC (rev 42912)
@@ -1,3 +1,8 @@
+2005-02-28 Marek Safar <[EMAIL PROTECTED]>
+
+ * attribute.cs (DefinePInvokeMethod): Fix, all data are stored
+ in the fields and not in the properties.
+
2005-02-28 Zoltan Varga <[EMAIL PROTECTED]>
* attribute.cs (GetMarshal): Marshal SizeConst and SizeParamIndex
Modified: trunk/mcs/gmcs/attribute.cs
===================================================================
--- trunk/mcs/gmcs/attribute.cs 2005-04-13 11:45:28 UTC (rev 42911)
+++ trunk/mcs/gmcs/attribute.cs 2005-04-13 11:46:27 UTC (rev 42912)
@@ -1080,27 +1080,27 @@
bool preserve_sig = true;
string entry_point = name;
- if (prop_info_arr != null) {
+ if (field_info_arr != null) {
int char_set_extra = 0;
- for (int i = 0; i < prop_info_arr.Length; i++) {
- switch (prop_info_arr [i].Name) {
+ for (int i = 0; i < field_info_arr.Length; i++)
{
+ switch (field_info_arr [i].Name) {
case "BestFitMapping":
throw new
NotImplementedException ();
case "CallingConvention":
- cc =
(CallingConvention) prop_values_arr [i];
+ cc =
(CallingConvention) field_values_arr [i];
break;
case "CharSet":
- charset = (CharSet)
prop_values_arr [i];
+ charset = (CharSet)
field_values_arr [i];
break;
case "EntryPoint":
- entry_point = (string)
prop_values_arr [i];
+ entry_point = (string)
field_values_arr [i];
break;
case "ExactSpelling":
char_set_extra |= 0x01;
break;
case "PreserveSig":
- preserve_sig = (bool)
prop_values_arr [i];
+ preserve_sig = (bool)
field_values_arr [i];
break;
case "SetLastError":
char_set_extra |= 0x40;
@@ -1108,7 +1108,7 @@
case "ThrowOnUnmappableChar":
throw new
NotImplementedException ();
default:
- throw new
InternalErrorException (prop_info_arr [i].ToString ());
+ throw new
InternalErrorException (field_info_arr [i].ToString ());
}
}
charset |= (CharSet)char_set_extra;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches