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)

1 files changed, 14 insertions, 0 deletions

diff --git a/cpp/src/Ice/FactoryTableInit.cpp b/cpp/src/Ice/FactoryTableInit.cpp
index fbc2bd82169..557bab6f56c 100644
--- a/cpp/src/Ice/FactoryTableInit.cpp
+++ b/cpp/src/Ice/FactoryTableInit.cpp
@@ -79,3 +79,17 @@ IceInternal::FactoryTableInit::~FactoryTableInit()
         delete factoryTable;
     }
 }
+
+
+IceInternal::CompactIdInit::CompactIdInit(const char* typeId, int compactId) :
+    _compactId(compactId)
+{
+    assert(_compactId >= 0);
+    factoryTable->addTypeId(_compactId, typeId);
+}
+
+IceInternal::CompactIdInit::~CompactIdInit()
+{
+    factoryTable->removeTypeId(_compactId);  
+}
+