diff options
| author | Michi Henning <michi@zeroc.com> | 2005-03-07 06:24:14 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2005-03-07 06:24:14 +0000 |
| commit | 9708fcd4b19b972c432b906203bd86c92cea596a (patch) | |
| tree | 7c666e0deb815df0062139643418580f65d5923a /cpp/src | |
| parent | Added remark about Ice for C# not working with Mono on Windows. (diff) | |
| download | ice-9708fcd4b19b972c432b906203bd86c92cea596a.tar.bz2 ice-9708fcd4b19b972c432b906203bd86c92cea596a.tar.xz ice-9708fcd4b19b972c432b906203bd86c92cea596a.zip | |
Removed obsolete work-around for Mono bug in generated code. Unfortunately,
icecs with Mono under Windows still doesn't work because
System.Array.Sort() collates incorrectly. No easy work-around at the
11th hour, so, for the moment, Ice for C# simply won't work with Mono
under Windows (but works with Mono under Linux).
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/slice2cs/Gen.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index fee8f38968d..3fdfbfba25f 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -202,28 +202,13 @@ Slice::CsVisitor::writeDispatch(const ClassDefPtr& p) _out << sp << nl << "public override bool ice_isA(string s)"; _out << sb; - _out << nl << "if(IceInternal.AssemblyUtil._runtime == IceInternal.AssemblyUtil.Runtime.Mono)" - " // Bug in Mono 1.0 DefaultInvariant"; - _out << sb; - _out << nl << "return _System.Array.BinarySearch(__ids, s) >= 0;"; - _out << eb; - _out << nl << "else"; - _out << sb; _out << nl << "return _System.Array.BinarySearch(__ids, s, _System.Collections.Comparer.DefaultInvariant) >= 0;"; _out << eb; - _out << eb; _out << sp << nl << "public override bool ice_isA(string s, Ice.Current __current)"; _out << sb; - _out << nl << "if(_System.Type.GetType(\"Mono.Runtime\", false) != null) // Bug in Mono 1.0 DefaultInvariant"; - _out << sb; - _out << nl << "return _System.Array.BinarySearch(__ids, s) >= 0;"; - _out << eb; - _out << nl << "else"; - _out << sb; _out << nl << "return _System.Array.BinarySearch(__ids, s, _System.Collections.Comparer.DefaultInvariant) >= 0;"; _out << eb; - _out << eb; _out << sp << nl << "public override string[] ice_ids()"; _out << sb; @@ -576,15 +561,8 @@ Slice::CsVisitor::writeDispatch(const ClassDefPtr& p) << "__dispatch(IceInternal.Incoming __in, Ice.Current __current)"; _out << sb; _out << nl << "int pos;"; - _out << nl << "if(_System.Type.GetType(\"Mono.Runtime\", false) != null) // Bug in Mono 1.0 DefaultInvariant"; - _out << sb; - _out << nl << "pos = _System.Array.BinarySearch(__all, __current.operation);"; - _out << eb; - _out << nl << "else"; - _out << sb; _out << nl << "pos = _System.Array.BinarySearch(__all, __current.operation, " << "_System.Collections.Comparer.DefaultInvariant);"; - _out << eb; _out << nl << "if(pos < 0)"; _out << sb; _out << nl << "return IceInternal.DispatchStatus.DispatchOperationNotExist;"; |