From 80dafbe5b1ed5b8d574d37a55954cb56ddac19d4 Mon Sep 17 00:00:00 2001
From: rjongbloed <rjongbloed>
Date: Sun, 11 Jul 2004 08:33:15 +0000
Subject: [PATCH] Fixed bizarre MSVC 6 bug by making template functons in a
 class.

---
 samples/factory/main.cxx | 135 +++++++++++++++++++++++------------------------
 1 file changed, 66 insertions(+), 69 deletions(-)
 rewrite samples/factory/main.cxx (83%)

diff --git a/samples/factory/main.cxx b/samples/factory/main.cxx
dissimilarity index 83%
index aedd0dc3..758c7c4d 100644
--- a/samples/factory/main.cxx
+++ b/samples/factory/main.cxx
@@ -1,69 +1,66 @@
-
-#include <ptlib.h>
-
-#include <ptclib/http.h>
-#include <ptclib/ptts.h>
-#include <ptclib/pwavfile.h>
-
-#include "abstract.h"
-
-extern unsigned PTraceCurrentLevel;
-
-class Factory : public PProcess
-{
-  public:
-    Factory()
-    : PProcess() { }
-    void Main();
-};
-
-PCREATE_PROCESS(Factory)
-
-template <class FactoryClass, typename TypeClass>
-void DisplayFactory(const char * title)
-{
-  cout << "Testing " << title << endl;
-  PFactory<FactoryClass, TypeClass>::KeyList_T keys = PFactory<FactoryClass, TypeClass>::GetKeyList();
-
-  cout << "keys = " << endl;
-  PFactory<FactoryClass, TypeClass>::KeyList_T::const_iterator r;
-  for (r = keys.begin(); r != keys.end(); ++r) {
-    cout << "  " << *r << endl;
-  }
-  
-  cout << endl;
-}
-
-template <class BaseClass, class TypeClass>
-void DisplayTestFactory()
-{
-  PFactory<BaseClass, TypeClass>::KeyList_T keyList = PFactory<MyAbstractClass, TypeClass>::GetKeyList();
-  PFactory<BaseClass, TypeClass>::KeyList_T::const_iterator r;
-
-  cout << "List of concrete types:" << endl;
-  for (r = keyList.begin(); r != keyList.end(); ++r)
-    cout << "  " << *r << endl;
-  cout << endl;
-
-  unsigned i;
-  for (i = 0; i < keyList.size(); i++) {
-    for (int j = 0; j < 3; j++)
-    {
-      MyAbstractClass * c = PFactory<MyAbstractClass, TypeClass>::CreateInstance(keyList[i]);
-      if (c == NULL) 
-        cout << "Cannot instantiate class " << keyList[i] << endl;
-      else
-        cout << keyList[i] << "::Function returned " << c->Function() << ", instance " << (void *)c << endl;
-    }
-  }
-}
-
-void Factory::Main()
-{
-  DisplayTestFactory<MyAbstractClass, PString>();
-  DisplayTestFactory<MyAbstractClass, unsigned>();
-
-  DisplayFactory<PURLScheme, PString>("PURLScheme");
-  DisplayFactory<PTextToSpeech, PString>("PTextToSpeech");
-  DisplayFactory<PPluginModuleManager, PString>("PPluginModuleManager");
-}
+
+#include <ptlib.h>
+
+#include <ptclib/http.h>
+#include <ptclib/ptts.h>
+#include <ptclib/pwavfile.h>
+
+#include "abstract.h"
+
+
+class Factory : public PProcess
+{
+  public:
+    Factory()
+    : PProcess() { }
+    void Main();
+};
+
+PCREATE_PROCESS(Factory)
+
+
+template <class BaseClass, typename TypeClass = PString>
+class Display
+{
+public:
+  static void ConcreteTypes(const char * title)
+  {
+    cout << "\nConcrete types for " << title << ':' << endl;
+    PFactory<BaseClass, TypeClass>::KeyList_T keys = PFactory<BaseClass, TypeClass>::GetKeyList();
+    PFactory<BaseClass, TypeClass>::KeyList_T::const_iterator r;
+    for (r = keys.begin(); r != keys.end(); ++r)
+      cout << "  " << *r << endl;
+  
+    cout << endl;
+  }
+
+  static void TestFactory()
+  {
+    PFactory<BaseClass, TypeClass>::KeyList_T keyList = PFactory<MyAbstractClass, TypeClass>::GetKeyList();
+    unsigned i;
+    for (i = 0; i < keyList.size(); i++) {
+      for (int j = 0; j < 3; j++)
+      {
+        MyAbstractClass * c = PFactory<MyAbstractClass, TypeClass>::CreateInstance(keyList[i]);
+        if (c == NULL) 
+          cout << "Cannot instantiate class " << keyList[i] << endl;
+        else
+          cout << keyList[i] << "::Function returned \"" << c->Function() << "\", instance " << (void *)c << endl;
+      }
+    }
+  }
+};
+
+
+void Factory::Main()
+{
+  Display<MyAbstractClass>::ConcreteTypes("MyAbstractClass by PString");
+  Display<MyAbstractClass>::TestFactory();
+
+  Display<MyAbstractClass, unsigned>::ConcreteTypes("MyAbstractClass by unsigned");
+  Display<MyAbstractClass, unsigned>::TestFactory();
+
+  Display<PURLScheme>::ConcreteTypes("PURLScheme");
+  Display<PTextToSpeech>::ConcreteTypes("PTextToSpeech");
+  Display<PPluginModuleManager>::ConcreteTypes("PPluginModuleManager");
+}
-- 
2.11.4.GIT