diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-04-09 15:16:12 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-04-09 15:16:12 +0800 |
| commit | 1cd08d48c3a9ea839c4e958a666ceef832a4f8d7 (patch) | |
| tree | 0766665cbc427ac3f5a34d61e80b9aafdc2b1ce9 /cpp/src/slice2sl/Gen.cpp | |
| parent | updating CHANGES for PHP (diff) | |
| download | ice-1cd08d48c3a9ea839c4e958a666ceef832a4f8d7.tar.bz2 ice-1cd08d48c3a9ea839c4e958a666ceef832a4f8d7.tar.xz ice-1cd08d48c3a9ea839c4e958a666ceef832a4f8d7.zip | |
Merged SL 0.1.1 3.3 refresh.
Squashed commit of the following:
commit 20ce2f93fefa2b6da83b1f48966ead7e2286ce15
Author: Matthew Newhook <matthew@zeroc.com>
Date: Wed Apr 9 12:09:16 2008 +0800
INSTALL changes.
commit 402ef51d793cdd70f70cf456a2d1e78ea26e6592
Author: Matthew Newhook <matthew@zeroc.com>
Date: Wed Apr 9 11:55:13 2008 +0800
more makefile changes. Fixed SL link the install notes.
commit 6b6629ccba8e5e4c5381d0198d6451b1aa8c0e3d
Author: Matthew Newhook <matthew@zeroc.com>
Date: Wed Apr 9 11:33:15 2008 +0800
Fix ICE_STRING_VERSION. Use SL specific common makefile.
commit 500d840149a1c6d8dfe2e246cb3e4962cce20dfb
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Apr 8 17:46:31 2008 +0800
Removed MT for staticlibs with SL.
commit 91f7c766ae847a08661595798faf7b9b615ff24a
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Apr 8 16:50:59 2008 +0800
Windows build system fixes.
commit 125fac5d17991d969c5ced2c36deb734f7eca80f
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Apr 8 16:19:38 2008 +0800
use distsl- not dist-
commit c476313288cab2f6b848e1bc85b46ecf536822c1
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Apr 8 16:15:29 2008 +0800
Fixes to the SL distribution.
commit ca4a232e73c25ce913cf89421e2d95c6a8a436b0
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Apr 8 15:45:12 2008 +0800
Changes for creating the SL distribution.
commit 416eb82b998a1a4d0942d22f0fa52c6afa618b5b
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Apr 8 13:44:03 2008 +0800
fix retry test
commit faff9983355eb9113b281c8a88217d3ac48ff4e5
Author: Matthew Newhook <matthew@zeroc.com>
Date: Tue Apr 8 12:18:30 2008 +0800
added missing file.
commit 0dfa5aa76b6eabc8da380ba71b4d86e508767dcc
Author: Matthew Newhook <matthew@zeroc.com>
Date: Mon Apr 7 18:15:58 2008 +0800
fixes for TestUtil so that the tests work with mono.
commit 6d8e8894b5f35de3d069adda2f455b0c46ac4430
Author: Matthew Newhook <matthew@zeroc.com>
Date: Mon Apr 7 15:32:23 2008 +0800
first set of changes to bring Ice for SL up to date.
Diffstat (limited to 'cpp/src/slice2sl/Gen.cpp')
| -rwxr-xr-x | cpp/src/slice2sl/Gen.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/slice2sl/Gen.cpp b/cpp/src/slice2sl/Gen.cpp index 928c019f67d..7f90053584a 100755 --- a/cpp/src/slice2sl/Gen.cpp +++ b/cpp/src/slice2sl/Gen.cpp @@ -2678,7 +2678,6 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) _out << eb; _out << nl << "catch(System.InvalidCastException)"; _out << sb; - _out << nl << "Ice.UnexpectedObjectException ex = new Ice.UnexpectedObjectException();"; _out << nl << "ret__ = null;"; _out << nl << "IceInternal.Ex.throwUOE(ret___PP.type(), ret___PP.value.ice_id());"; _out << eb; @@ -3438,7 +3437,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) { _out << nl << "catch(Ice.UserException ex__)"; _out << sb; - _out << nl << "ice_exception(ex__);"; + _out << nl << "exception_(ex__);"; _out << nl << "return;"; _out << eb; } |