summaryrefslogtreecommitdiff
path: root/cs/src/Ice/ConnectionFactory.cs
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2012-04-25 11:19:13 +0200
committerBenoit Foucher <benoit@zeroc.com>2012-04-25 11:19:13 +0200
commit7e874613ff22bedf988273b51a15ab937f01169f (patch)
tree115a92a902f80fcc6252c5fac6a957ecc548b82c /cs/src/Ice/ConnectionFactory.cs
parentFixed copyrights (diff)
downloadice-7e874613ff22bedf988273b51a15ab937f01169f.tar.bz2
ice-7e874613ff22bedf988273b51a15ab937f01169f.tar.xz
ice-7e874613ff22bedf988273b51a15ab937f01169f.zip
Merged Silverlight support
Diffstat (limited to 'cs/src/Ice/ConnectionFactory.cs')
-rw-r--r--cs/src/Ice/ConnectionFactory.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/cs/src/Ice/ConnectionFactory.cs b/cs/src/Ice/ConnectionFactory.cs
index 4f0b6cbf200..354f2207ea6 100644
--- a/cs/src/Ice/ConnectionFactory.cs
+++ b/cs/src/Ice/ConnectionFactory.cs
@@ -1462,7 +1462,7 @@ namespace IceInternal
//
// Operations from EventHandler.
//
- public override bool startAsync(int unused, AsyncCallback callback, ref bool completedSynchronously)
+ public override bool startAsync(int operation, AsyncCallback callback, ref bool completedSynchronously)
{
if(_state >= StateClosed)
{
@@ -1483,7 +1483,7 @@ namespace IceInternal
}
finally
{
-#if !COMPACT
+#if !COMPACT && !SILVERLIGHT
System.Environment.FailFast(s);
#endif
}
@@ -1510,7 +1510,7 @@ namespace IceInternal
}
finally
{
-#if !COMPACT
+#if !COMPACT && !SILVERLIGHT
System.Environment.FailFast(s);
#endif
}
@@ -1582,7 +1582,7 @@ namespace IceInternal
}
finally
{
-#if !COMPACT
+#if !COMPACT && !SILVERLIGHT
System.Environment.FailFast(s);
#endif
}