projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86b1b8b
)
GetMarshalledDomainObjRef() is needed also in the 2.1-based profiles for appdomain...
author
Paolo Molaro
<lupus@oddwiz.org>
Fri, 16 Sep 2011 12:07:07 +0000
(14:07 +0200)
committer
Paolo Molaro
<lupus@oddwiz.org>
Fri, 16 Sep 2011 12:07:50 +0000
(14:07 +0200)
mcs/class/corlib/System/AppDomain.cs
patch
|
blob
|
history
diff --git
a/mcs/class/corlib/System/AppDomain.cs
b/mcs/class/corlib/System/AppDomain.cs
index 9221b208d8bdf5f2dab266fee5ee08194e80f0d5..4742c1f7df639af882dac578eff47aa37f57d7b1 100644
(file)
--- a/
mcs/class/corlib/System/AppDomain.cs
+++ b/
mcs/class/corlib/System/AppDomain.cs
@@
-1352,13
+1352,12
@@
namespace System {
DomainUnload(this, null);
}
-#if !NET_2_1
internal byte[] GetMarshalledDomainObjRef ()
{
ObjRef oref = RemotingServices.Marshal (AppDomain.CurrentDomain, null, typeof (AppDomain));
return CADSerializer.SerializeObject (oref).GetBuffer();
}
-#endif
+
internal void ProcessMessageInDomain (byte[] arrRequest, CADMethodCallMessage cadMsg,
out byte[] arrResponse, out CADMethodReturnMessage cadMrm)
{