From 1c03403475d48cf3269a23716bbe73767ccc389e Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Tue, 1 Apr 2008 13:44:50 -0230 Subject: Bug 2940 - optionally generated pdbs for release builds --- cpp/src/slice2cpp/Makefile.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpp/src/slice2cpp') diff --git a/cpp/src/slice2cpp/Makefile.mak b/cpp/src/slice2cpp/Makefile.mak index 16b28dacd30..433bcac6e89 100644 --- a/cpp/src/slice2cpp/Makefile.mak +++ b/cpp/src/slice2cpp/Makefile.mak @@ -22,7 +22,7 @@ SRCS = $(OBJS:.obj=.cpp) CPPFLAGS = -I. $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -!if "$(CPP_COMPILER)" != "BCC2006" && "$(OPTIMIZE)" != "yes" +!if "$(GENERATE_PDB)" == "yes" PDBFLAGS = /pdb:$(NAME:.exe=.pdb) !endif -- cgit v1.2.3 From 61c042a6a2e706e75c1a948eedcfe9c6d9fb7197 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Wed, 2 Apr 2008 17:12:55 +0200 Subject: Fixed bug 2962 --- cpp/src/slice2cpp/Gen.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cpp/src/slice2cpp') diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index ddf90893d2b..85662dff609 100755 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2694,7 +2694,12 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p) } C << nl << "catch(const ::Ice::UserException& __ex)"; C << sb; - C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());"; + // + // COMPILERFIX: Don't throw UnknownUserException directly. This is causing access + // violation errors with Visual C++ 64bits optimized builds. See bug #2962. + // + C << nl << "::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());"; + C << nl << "throw __uue;"; C << eb; C << eb; -- cgit v1.2.3