diff options
author | Jose <jose@zeroc.com> | 2016-05-11 16:51:13 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2016-05-11 16:51:13 +0200 |
commit | 20ead35bcd15c258b00da6b1a16d26107f8dea8b (patch) | |
tree | 0aa99a82b9d56383c76c372fc1050dfd5493b4e9 /csharp/src/Ice/ObjectAdapterI.cs | |
parent | Fixed make install issue (diff) | |
download | ice-20ead35bcd15c258b00da6b1a16d26107f8dea8b.tar.bz2 ice-20ead35bcd15c258b00da6b1a16d26107f8dea8b.tar.xz ice-20ead35bcd15c258b00da6b1a16d26107f8dea8b.zip |
CSharp mapping cleanup
- Remove code support for old ussuported frameworks (SILVERLIGHT, COMPACT, MONO)
- Remove code support for deprecated collection mappings clr:collection
Diffstat (limited to 'csharp/src/Ice/ObjectAdapterI.cs')
-rw-r--r-- | csharp/src/Ice/ObjectAdapterI.cs | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/csharp/src/Ice/ObjectAdapterI.cs b/csharp/src/Ice/ObjectAdapterI.cs index df2f40c720d..f6dec965c71 100644 --- a/csharp/src/Ice/ObjectAdapterI.cs +++ b/csharp/src/Ice/ObjectAdapterI.cs @@ -1018,36 +1018,6 @@ namespace Ice } } - /* - ~ObjectAdapterI() - { - if(!_deactivated) - { - string msg = "object adapter `" + getName() + "' has not been deactivated"; - if(!Environment.HasShutdownStarted) - { - instance_.initializationData().logger.warning(msg); - } - else - { - Console.Error.WriteLine(msg); - } - } - else if(!_destroyed) - { - string msg = "object adapter `" + getName() + "' has not been destroyed"; - if(!Environment.HasShutdownStarted) - { - instance_.initializationData().logger.warning(msg); - } - else - { - Console.Error.WriteLine(msg); - } - } - } - */ - private ObjectPrx newProxy(Identity ident, string facet) { if(_id.Length == 0) @@ -1205,25 +1175,6 @@ namespace Ice EndpointI endp = instance_.endpointFactoryManager().create(s, oaEndpoints); if(endp == null) { -#if COMPACT - if(s.StartsWith("ssl", StringComparison.Ordinal) || s.StartsWith("wss", StringComparison.Ordinal)) - { - instance_.initializationData().logger.warning( - "ignoring endpoint `" + s + - "': IceSSL is not supported with the .NET Compact Framework"); - ++end; - continue; - } -#else - if(AssemblyUtil.runtime_ == AssemblyUtil.Runtime.Mono && - (s.StartsWith("ssl", StringComparison.Ordinal) || s.StartsWith("wss", StringComparison.Ordinal))) - { - instance_.initializationData().logger.warning( - "ignoring endpoint `" + s + "': IceSSL is not supported with Mono"); - ++end; - continue; - } -#endif Ice.EndpointParseException e2 = new Ice.EndpointParseException(); e2.str = "invalid object adapter endpoint `" + s + "'"; throw e2; |