Author: marek
Date: 2005-04-13 02:52:42 -0400 (Wed, 13 Apr 2005)
New Revision: 42888

Modified:
   trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog
   trunk/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
Log:
2005-04-13  Marek Safar  <[EMAIL PROTECTED]>

        * TypeBuilder.cs (SetCustomAttribute): StructLayoutAttribute.CharSet
        has to overwrite current settings.

Modified: trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog     2005-04-13 
06:31:50 UTC (rev 42887)
+++ trunk/mcs/class/corlib/System.Reflection.Emit/ChangeLog     2005-04-13 
06:52:42 UTC (rev 42888)
@@ -1,3 +1,8 @@
+2005-04-13  Marek Safar  <[EMAIL PROTECTED]>
+
+       * TypeBuilder.cs (SetCustomAttribute): StructLayoutAttribute.CharSet
+       has to overwrite current settings.
+
 2005-04-05  Sebastien Pouliot  <[EMAIL PROTECTED]>
 
        * AssemblyBuilder.cs: Don't call GetCurrentDirectory if building an 

Modified: trunk/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
===================================================================
--- trunk/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs        
2005-04-13 06:31:50 UTC (rev 42887)
+++ trunk/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs        
2005-04-13 06:52:42 UTC (rev 42888)
@@ -1174,11 +1174,14 @@
                                                switch ((CharSet)value) {
                                                case CharSet.None:
                                                case CharSet.Ansi:
+                                                       attrs &= 
~(TypeAttributes.UnicodeClass | TypeAttributes.AutoClass);
                                                        break;
                                                case CharSet.Unicode:
+                                                       attrs &= 
~TypeAttributes.AutoClass;
                                                        attrs |= 
TypeAttributes.UnicodeClass;
                                                        break;
                                                case CharSet.Auto:
+                                                       attrs &= 
~TypeAttributes.UnicodeClass;
                                                        attrs |= 
TypeAttributes.AutoClass;
                                                        break;
                                                default:

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to