Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@ -288,7 +288,7 @@ namespace System.Reflection.Emit {
}
public TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, int typesize) {
return DefineType (name, attr, parent, null, PackingSize.Unspecified, TypeBuilder.UnspecifiedTypeSize);
return DefineType (name, attr, parent, null, PackingSize.Unspecified, typesize);
}
public TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, PackingSize packsize) {
@ -723,7 +723,7 @@ namespace System.Reflection.Emit {
if (resource_writers != null && (rwriter = resource_writers [resources [i].name] as IResourceWriter) != null) {
ResourceWriter writer = (ResourceWriter)rwriter;
writer.Generate ();
MemoryStream mstream = (MemoryStream)writer.Stream;
MemoryStream mstream = (MemoryStream)writer._output;
resources [i].data = new byte [mstream.Length];
mstream.Seek (0, SeekOrigin.Begin);
mstream.Read (resources [i].data, 0, (int)mstream.Length);