summaryrefslogtreecommitdiff
path: root/csharp/src/Ice/OutputStream.cs
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-03 15:40:55 -0400
committerBernard Normier <bernard@zeroc.com>2016-11-03 15:40:55 -0400
commitc693f916141772b82da44d0ef90f64602a69d3ec (patch)
treebb104e0db314089bfae763dfeeff9a9c0fbcc0e4 /csharp/src/Ice/OutputStream.cs
parentFix ICE-7433 - C++ Ice/exceptions failure (diff)
downloadice-c693f916141772b82da44d0ef90f64602a69d3ec.tar.bz2
ice-c693f916141772b82da44d0ef90f64602a69d3ec.tar.xz
ice-c693f916141772b82da44d0ef90f64602a69d3ec.zip
Replaced double underscores in C# mapping by ice-prefix names
Diffstat (limited to 'csharp/src/Ice/OutputStream.cs')
-rw-r--r--csharp/src/Ice/OutputStream.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/csharp/src/Ice/OutputStream.cs b/csharp/src/Ice/OutputStream.cs
index 89f42e694f3..3b2e1e0aa60 100644
--- a/csharp/src/Ice/OutputStream.cs
+++ b/csharp/src/Ice/OutputStream.cs
@@ -343,7 +343,7 @@ namespace Ice
_encapsStack.start = _buf.b.position();
writeInt(0); // Placeholder for the encapsulation length.
- _encapsStack.encoding.write__(this);
+ _encapsStack.encoding.iceWrite(this);
}
/// <summary>
@@ -373,7 +373,7 @@ namespace Ice
{
Protocol.checkSupportedEncoding(encoding);
writeInt(6); // Size
- encoding.write__(this);
+ encoding.iceWrite(this);
}
/// <summary>
@@ -1967,12 +1967,12 @@ namespace Ice
{
if(v != null)
{
- v.write__(this);
+ v.iceWrite(this);
}
else
{
Identity ident = new Identity();
- ident.write__(this);
+ ident.iceWrite(this);
}
}
@@ -2258,9 +2258,9 @@ namespace Ice
// This allows reading the pending instances even if some part of
// the exception was sliced.
//
- bool usesClasses = v.usesClasses__();
+ bool usesClasses = v.iceUsesClasses();
_stream.writeBool(usesClasses);
- v.write__(_stream);
+ v.iceWrite(_stream);
if(usesClasses)
{
writePendingValues();
@@ -2363,7 +2363,7 @@ namespace Ice
_stream.instance().initializationData().logger.warning(s);
}
- p.Key.write__(_stream);
+ p.Key.iceWrite(_stream);
}
}
_stream.writeSize(0); // Zero marker indicates end of sequence of sequences of instances.
@@ -2456,7 +2456,7 @@ namespace Ice
internal override void writeException(UserException v)
{
- v.write__(_stream);
+ v.iceWrite(_stream);
}
internal override void startInstance(SliceType sliceType, SlicedData data)
@@ -2700,7 +2700,7 @@ namespace Ice
}
_stream.writeSize(1); // Object instance marker.
- v.write__(_stream);
+ v.iceWrite(_stream);
}
private sealed class InstanceData
@@ -2820,12 +2820,12 @@ namespace Ice
/// <param name="outStream">The stream to write to.</param>
public abstract void write(OutputStream outStream);
- public override void write__(OutputStream os)
+ public override void iceWrite(OutputStream os)
{
write(os);
}
- public override void read__(InputStream istr)
+ public override void iceRead(InputStream istr)
{
Debug.Assert(false);
}