summaryrefslogtreecommitdiff
path: root/csharp/src/Ice/InputStream.cs
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-05-11 16:51:13 +0200
committerJose <jose@zeroc.com>2016-05-11 16:51:13 +0200
commit20ead35bcd15c258b00da6b1a16d26107f8dea8b (patch)
tree0aa99a82b9d56383c76c372fc1050dfd5493b4e9 /csharp/src/Ice/InputStream.cs
parentFixed make install issue (diff)
downloadice-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/InputStream.cs')
-rw-r--r--csharp/src/Ice/InputStream.cs11
1 files changed, 1 insertions, 10 deletions
diff --git a/csharp/src/Ice/InputStream.cs b/csharp/src/Ice/InputStream.cs
index 121274da87d..b9cb5a50e35 100644
--- a/csharp/src/Ice/InputStream.cs
+++ b/csharp/src/Ice/InputStream.cs
@@ -11,15 +11,10 @@ namespace Ice
{
using System;
- using System.Collections;
using System.Collections.Generic;
using System.Diagnostics;
- using System.Reflection;
-#if !COMPACT && !SILVERLIGHT
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
-#endif
- using System.Threading;
using Protocol = IceInternal.Protocol;
/// <summary>
@@ -1094,7 +1089,6 @@ namespace Ice
/// <returns>The serializable object.</returns>
public object readSerializable()
{
-#if !COMPACT && !SILVERLIGHT
int sz = readAndCheckSeqSize(1);
if(sz == 0)
{
@@ -1110,9 +1104,6 @@ namespace Ice
{
throw new Ice.MarshalException("cannot deserialize object:", ex);
}
-#else
- throw new Ice.MarshalException("serialization not supported");
-#endif
}
/// <summary>
@@ -3112,7 +3103,7 @@ namespace Ice
// Set the reason member to a more helpful message.
//
ex.reason = "unknown exception type `" + mostDerivedId + "'";
- throw ex;
+ throw;
}
}
}