1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-18 03:00:42 -04:00
ports/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
Michael Gmelin 4aff7c172a Update devel/ice, devel/py-ice and devel/php5-ice to 3.6.0
PR:		201143
Differential Revision:	https://reviews.freebsd.org/D2930
Reviewed by:	bapt
Approved by:	bapt
Tested by:	Roger Leigh <rleigh@codelibre.net>
2015-07-13 19:48:31 +00:00

23 lines
691 B
C++

--- cpp/src/IceGrid/PluginFacadeI.cpp.orig 2015-07-03 17:38:27.734242982 +0200
+++ cpp/src/IceGrid/PluginFacadeI.cpp 2015-07-03 17:42:42.990740982 +0200
@@ -34,10 +34,16 @@
IceGrid::setRegistryPluginFacade(new RegistryPluginFacadeI);
}
- ~Init()
- {
- IceGrid::setRegistryPluginFacade(0);
- }
+/* This is a bad idea, see
+ * https://isocpp.org/wiki/faq/ctors#construct-on-first-use-v2
+ * That's why we disabled it and make sure the registrypluginfacace
+ * is reset somwhere else. Construction is still here, so that
+ * registry plugins work as expected.
+ * ~Init()
+ * {
+ * IceGrid::setRegistryPluginFacade(0);
+ * }
+ */
};
Init init;