diff options
author | Michi Henning <michi@zeroc.com> | 2005-05-13 07:37:50 +0000 |
---|---|---|
committer | Michi Henning <michi@zeroc.com> | 2005-05-13 07:37:50 +0000 |
commit | 16147878fabbf704b873a21faf58027cdeebf2fb (patch) | |
tree | 10b503bbe23efdf404df2239009e620b04b7acc9 /cpp/src/Slice/CsUtil.cpp | |
parent | use /bin/kill not /usr/bin/kill (diff) | |
download | ice-16147878fabbf704b873a21faf58027cdeebf2fb.tar.bz2 ice-16147878fabbf704b873a21faf58027cdeebf2fb.tar.xz ice-16147878fabbf704b873a21faf58027cdeebf2fb.zip |
__in -> __inS, __out -> __outS See
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=322
Diffstat (limited to 'cpp/src/Slice/CsUtil.cpp')
-rwxr-xr-x | cpp/src/Slice/CsUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp index 8565d295977..8f9880d1349 100755 --- a/cpp/src/Slice/CsUtil.cpp +++ b/cpp/src/Slice/CsUtil.cpp @@ -227,11 +227,11 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out, if(marshal) { - stream = streamingAPI ? "__out" : "__os"; + stream = streamingAPI ? "__outS" : "__os"; } else { - stream = streamingAPI ? "__in" : "__is"; + stream = streamingAPI ? "__inS" : "__is"; } BuiltinPtr builtin = BuiltinPtr::dynamicCast(type); @@ -523,11 +523,11 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out, string stream; if(marshal) { - stream = streamingAPI ? "__out" : "__os"; + stream = streamingAPI ? "__outS" : "__os"; } else { - stream = streamingAPI ? "__in" : "__is"; + stream = streamingAPI ? "__inS" : "__is"; } TypePtr type = seq->type(); |