blob: a96b1e8f692ec27c1db20784e49e51ab21c16940 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
--- cpp/include/Ice/FactoryTableInit.h.orig 2019-08-12 19:54:18 UTC
+++ cpp/include/Ice/FactoryTableInit.h
@@ -48,6 +48,9 @@ class DefaultUserExceptionFactoryInit (public)
DefaultUserExceptionFactoryInit(const char* typeId) :
_typeId(typeId)
+#if defined(ICE_BROKEN_ATEXIT)
+ , _ftableInit(new IceInternal::FactoryTableInit)
+#endif
{
factoryTable->addExceptionFactory(_typeId, new DefaultUserExceptionFactory<E>(_typeId));
}
@@ -55,10 +58,16 @@ class DefaultUserExceptionFactoryInit (public)
~DefaultUserExceptionFactoryInit()
{
factoryTable->removeExceptionFactory(_typeId);
+#if defined(ICE_BROKEN_ATEXIT)
+ delete _ftableInit;
+#endif
}
private:
const ::std::string _typeId;
+#if defined(ICE_BROKEN_ATEXIT)
+ IceInternal::FactoryTableInit* _ftableInit;
+#endif
};
template<class O>
@@ -68,6 +77,9 @@ class DefaultObjectFactoryInit (public)
DefaultObjectFactoryInit(const char* typeId) :
_typeId(typeId)
+#if defined(ICE_BROKEN_ATEXIT)
+ , _ftableInit(new IceInternal::FactoryTableInit)
+#endif
{
factoryTable->addObjectFactory(_typeId, new DefaultObjectFactory<O>(_typeId));
}
@@ -75,11 +87,16 @@ class DefaultObjectFactoryInit (public)
~DefaultObjectFactoryInit()
{
factoryTable->removeObjectFactory(_typeId);
+#if defined(ICE_BROKEN_ATEXIT)
+ delete _ftableInit;
+#endif
}
private:
const ::std::string _typeId;
-
+#if defined(ICE_BROKEN_ATEXIT)
+ IceInternal::FactoryTableInit* _ftableInit;
+#endif
};
}
|
