You've already forked linux-packaging-mono
Imported Upstream version 6.4.0.137
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
parent
e9207cf623
commit
ef583813eb
@ -41,8 +41,11 @@ namespace System.Runtime.Remoting.Messaging {
|
||||
|
||||
[Serializable]
|
||||
[StructLayout (LayoutKind.Sequential)]
|
||||
internal class MonoMethodMessage : IMethodCallMessage, IMethodReturnMessage, IInternalMessage {
|
||||
|
||||
internal class MonoMethodMessage
|
||||
#if !DISABLE_REMOTING
|
||||
: IMethodCallMessage, IMethodReturnMessage, IInternalMessage
|
||||
#endif
|
||||
{
|
||||
#pragma warning disable 649
|
||||
#region keep in sync with MonoMessage in object-internals.h
|
||||
RuntimeMethodInfo method;
|
||||
@ -59,12 +62,13 @@ namespace System.Runtime.Remoting.Messaging {
|
||||
|
||||
string uri;
|
||||
|
||||
#if !DISABLE_REMOTING
|
||||
MCMDictionary properties;
|
||||
Identity identity;
|
||||
#endif
|
||||
|
||||
Type[] methodSignature;
|
||||
|
||||
Identity identity;
|
||||
|
||||
internal void InitMessage (RuntimeMethodInfo method, object [] out_args)
|
||||
{
|
||||
this.method = method;
|
||||
@ -132,8 +136,12 @@ namespace System.Runtime.Remoting.Messaging {
|
||||
|
||||
public IDictionary Properties {
|
||||
get {
|
||||
#if DISABLE_REMOTING
|
||||
throw new PlatformNotSupportedException ();
|
||||
#else
|
||||
if (properties == null) properties = new MCMDictionary (this);
|
||||
return properties;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@ -365,6 +373,7 @@ namespace System.Runtime.Remoting.Messaging {
|
||||
return null;
|
||||
}
|
||||
|
||||
#if !DISABLE_REMOTING
|
||||
Identity IInternalMessage.TargetIdentity
|
||||
{
|
||||
get { return identity; }
|
||||
@ -375,6 +384,7 @@ namespace System.Runtime.Remoting.Messaging {
|
||||
{
|
||||
return properties != null;
|
||||
}
|
||||
#endif
|
||||
|
||||
public bool IsAsync
|
||||
{
|
||||
@ -392,8 +402,10 @@ namespace System.Runtime.Remoting.Messaging {
|
||||
{
|
||||
// FIXME: ideally, the OneWay type would be set by the runtime
|
||||
|
||||
#if !DISABLE_REMOTING
|
||||
if (call_type == CallType.Sync && RemotingServices.IsOneWay (method))
|
||||
call_type = CallType.OneWay;
|
||||
#endif
|
||||
return call_type;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user