diff options
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/slice2sl/Gen.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/slice2sl/Makefile.mak | 4 |
2 files changed, 5 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; } diff --git a/cpp/src/slice2sl/Makefile.mak b/cpp/src/slice2sl/Makefile.mak index 7a8ec7a873e..819f5c79b41 100644 --- a/cpp/src/slice2sl/Makefile.mak +++ b/cpp/src/slice2sl/Makefile.mak @@ -32,6 +32,10 @@ RES_FILE = ,, Slice2Sl.res RES_FILE = Slice2Sl.res
!endif
+!if "$(STATICLIBS)" == "yes"
+BASELIBS = $(MCPP_LIBS) $(BASELIBS)
+!endif
+
$(NAME): $(OBJS) Slice2Sl.res
$(LINK) $(LD_EXEFLAGS) $(PDBFLAGS) $(OBJS) $(SETARGV) $(PREOUT)$@ $(PRELIBS)slice$(LIBSUFFIX).lib \
$(BASELIBS) $(RES_FILE)
|