Merged HEAD and slicing trees.

1 files changed, 37 insertions, 0 deletions

diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
new file mode 100644
index 00000000000..1166208c4d7
--- /dev/null
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -0,0 +1,37 @@
+// **********************************************************************
+//
+// Copyright (c) 2003
+// ZeroC, Inc.
+// Billerica, MA, USA
+//
+// All Rights Reserved.
+//
+// Ice is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License version 2 as published by
+// the Free Software Foundation.
+//
+// **********************************************************************
+
+#include <Ice/FactoryTable.h>
+
+//
+// This constructor initializes the single global Ice::factoryTable instance
+// from the outside (if it hasn't been initialized yet). The constructor here
+// is triggered by a file-static instance of FactoryTable in each
+// slice2cpp-generated header file that uses non-local exceptions or non-abstract classes.
+// This ensures that Ice::factoryTable is always initialized before it is used.
+//
+Ice::FactoryTable::FactoryTable()
+{
+
+    Ice::factoryTableWrapper.initialize();
+}
+
+//
+// Similarly, the destructor calls the finalize() method on the factory table wrapper which,
+// once the tables reference count drops to zero, deletes the table.
+//
+Ice::FactoryTable::~FactoryTable()
+{
+    Ice::factoryTableWrapper.finalize();
+}