2 files changed, 1 insertions, 95 deletions
diff --git a/cpp/src/Ice/ice.dsp b/cpp/src/Ice/ice.dsp
index f2f3d6a90b9..bb65608f7dc 100644
--- a/cpp/src/Ice/ice.dsp
+++ b/cpp/src/Ice/ice.dsp
@@ -392,14 +392,6 @@ SOURCE=.\UdpTransceiver.cpp
 
 SOURCE=.\UnknownEndpoint.cpp
 # End Source File
-# Begin Source File
-
-SOURCE=.\UserExceptionFactory.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\UserExceptionFactoryManager.cpp
-# End Source File
 # End Group
 # Begin Group "Header Files"
 
@@ -896,18 +888,6 @@ SOURCE=.\UnknownEndpoint.h
 
 SOURCE=..\..\include\Ice\UserExceptionFactory.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\include\Ice\UserExceptionFactoryF.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\UserExceptionFactoryManager.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\UserExceptionFactoryManagerF.h
-# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -1932,80 +1912,6 @@ InputPath=..\..\slice\Ice\StreamF.ice
 !ENDIF 
 
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Ice\UserExceptionFactory.ice
-
-!IF  "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__USERE="../../bin/slice2cpp.exe"	
-# Begin Custom Build
-InputPath=..\..\slice\Ice\UserExceptionFactory.ice
-
-BuildCmds= \
-	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/UserExceptionFactory.ice \
-	move UserExceptionFactory.h ..\..\include\Ice \
-	
-
-"..\..\include\Ice\UserExceptionFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"UserExceptionFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
-
-# Begin Custom Build
-InputPath=..\..\slice\Ice\UserExceptionFactory.ice
-
-BuildCmds= \
-	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/UserExceptionFactory.ice \
-	move UserExceptionFactory.h ..\..\include\Ice \
-	
-
-"..\..\include\Ice\UserExceptionFactory.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-
-"UserExceptionFactory.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-   $(BuildCmds)
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\slice\Ice\UserExceptionFactoryF.ice
-
-!IF  "$(CFG)" == "Ice - Win32 Release"
-
-USERDEP__USEREX="../../bin/slice2cpp.exe"	
-# Begin Custom Build
-InputPath=..\..\slice\Ice\UserExceptionFactoryF.ice
-
-"..\..\include\Ice\UserExceptionFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/UserExceptionFactoryF.ice 
-	move UserExceptionFactoryF.h ..\..\include\Ice 
-	del UserExceptionFactoryF.cpp 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "Ice - Win32 Debug"
-
-# Begin Custom Build
-InputPath=..\..\slice\Ice\UserExceptionFactoryF.ice
-
-"..\..\include\Ice\UserExceptionFactoryF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	..\..\bin\slice2cpp.exe --ice --dll-export ICE_API --include-dir Ice -I../../slice ../../slice/Ice/UserExceptionFactoryF.ice 
-	move UserExceptionFactoryF.h ..\..\include\Ice 
-	del UserExceptionFactoryF.cpp 
-	
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index bd20cb5a279..13a34a2e4a0 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2440,7 +2440,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
 	string name = fixKwd(p->name());
 	string scope = fixKwd(p->scope());
 
-	H << sp << nl << "void __patch__" << name << "Ptr(void*, ::Ice::ObjectPtr&);";
+	H << sp << nl << "void " << _dllExport << "__patch__" << name << "Ptr(void*, ::Ice::ObjectPtr&);";
 
 	C << sp << nl << "void";
 	C << nl << scope << "__patch__" << name << "Ptr(void* __addr, ::Ice::ObjectPtr& v)";