summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/FactoryTable.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-06-16 16:56:03 +0000
committerBernard Normier <bernard@zeroc.com>2014-06-16 16:56:03 +0000
commitdfbaed856c3559145ff1ce20dfdcb4c6fc7069a9 (patch)
tree146c0a563e94c948e2c6aaab80b2684919dba8f3 /cpp/src/Ice/FactoryTable.cpp
parentC# IceSSL fixes (diff)
downloadice-dfbaed856c3559145ff1ce20dfdcb4c6fc7069a9.tar.bz2
ice-dfbaed856c3559145ff1ce20dfdcb4c6fc7069a9.tar.xz
ice-dfbaed856c3559145ff1ce20dfdcb4c6fc7069a9.zip
Fix for ICE-5527 (simplify generated code for user exception and object factories), ICE-4832 (ice_staticId and static initialization) and partial fix for ICE-5515 (ice_staticId on C++ proxies)
Diffstat (limited to 'cpp/src/Ice/FactoryTable.cpp')
-rw-r--r--cpp/src/Ice/FactoryTable.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index 1a198fff621..993c5c641b8 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -8,7 +8,7 @@
// **********************************************************************
#include <Ice/FactoryTable.h>
-#include <Ice/UserExceptionFactory.h>
+#include <Ice/ObjectFactory.h>
//
// Add a factory to the exception factory table.