* tests/POA/NewPOA/NewPOA.cpp:

* tests/POA/RootPOA/RootPOA.cpp:
* tests/POA/FindPOA/FindPOA.cpp:
Used the ::in() method as first	argument to _narrow() calls.

* tao/poa.cpp: Added explicit template instantiations.

11 files changed, 140 insertions, 8 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 130c1d45f17..51ae23e126d 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,17 @@
+Fri Jan 23 14:47:18 1998  Chris Cleeland  <cleeland@cs.wustl.edu>
+
+	* tests/POA/{FindPOA,RootPOA,NewPOA}/Makefile: Added
+ 	-L$(TAO_ROOT)/tao to LDFLAGS.
+
+	* tests/POA/NewPOA/NewPOA.cpp: 
+	* tests/POA/RootPOA/RootPOA.cpp: 
+	* tests/POA/FindPOA/FindPOA.cpp: 
+	Used the ::in() method as first	argument to _narrow() calls.
+
+	* tests/{Makefile,README}: Updated for new tests.
+
+	* tao/poa.cpp: Added explicit template instantiations.
+
 Fri Jan 23 14:30:19 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
 	* tao/poa.h: 
diff --git a/TAO/tao/poa.cpp b/TAO/tao/poa.cpp
index f259109eef6..1b7bc638f9f 100644
--- a/TAO/tao/poa.cpp
+++ b/TAO/tao/poa.cpp
@@ -3306,3 +3306,75 @@ TAO_POA_Current::locator_cookie (PortableServer::ServantLocator::Cookie cookie)
 {
   this->cookie_ = cookie;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Implicit_Activation_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Object_Table_Iterator_Impl>;
+template class ACE_Auto_Basic_Ptr<TAO_POA>;
+template class ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Thread_Policy>;
+template class ACE_Lock_Adapter<ACE_Null_Mutex>;
+template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
+template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
+template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
+template class ACE_Map_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
+template class ACE_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
+template class ACE_Read_Guard<ACE_Lock>;
+template class ACE_Unbounded_Set<TAO_POA *>;
+template class ACE_Unbounded_Set_Iterator<TAO_POA *>;
+template class ACE_Write_Guard<ACE_Lock>;
+template class TAO_Object_Manager<PortableServer::Policy>;
+template class TAO_Unbounded_Object_Sequence<PortableServer::Policy>;
+template class auto_ptr<TAO_Id_Assignment_Policy>;
+template class auto_ptr<TAO_Id_Uniqueness_Policy>;
+template class auto_ptr<TAO_Implicit_Activation_Policy>;
+template class auto_ptr<TAO_Lifespan_Policy>;
+template class auto_ptr<TAO_Object_Table_Iterator_Impl>;
+template class auto_ptr<TAO_POA>;
+template class auto_ptr<TAO_Request_Processing_Policy>;
+template class auto_ptr<TAO_Servant_Retention_Policy>;
+template class auto_ptr<TAO_Thread_Policy>;
+template class ACE_Map_Entry<ACE_CString, TAO_POA *>;
+template class ACE_Map_Reverse_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
+template class ACE_Node<TAO_POA *>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Implicit_Activation_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Table_Iterator_Impl>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Thread_Policy>
+#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
+#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
+#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
+#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
+#pragma instantiate ACE_Map_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator_Base<ACE_CString, TAO_POA *, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
+#pragma instantiate ACE_Read_Guard<ACE_Lock>
+#pragma instantiate ACE_Unbounded_Set<TAO_POA *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA *>
+#pragma instantiate ACE_Write_Guard<ACE_Lock>
+#pragma instantiate TAO_Object_Manager<PortableServer::Policy>
+#pragma instantiate TAO_Unbounded_Object_Sequence<PortableServer::Policy>
+#pragma instantiate auto_ptr<TAO_Id_Assignment_Policy>
+#pragma instantiate auto_ptr<TAO_Id_Uniqueness_Policy>
+#pragma instantiate auto_ptr<TAO_Implicit_Activation_Policy>
+#pragma instantiate auto_ptr<TAO_Lifespan_Policy>
+#pragma instantiate auto_ptr<TAO_Object_Table_Iterator_Impl>
+#pragma instantiate auto_ptr<TAO_POA>
+#pragma instantiate auto_ptr<TAO_Request_Processing_Policy>
+#pragma instantiate auto_ptr<TAO_Servant_Retention_Policy>
+#pragma instantiate auto_ptr<TAO_Thread_Policy>
+#pragma instantiate ACE_Map_Entry<ACE_CString, TAO_POA *>
+#pragma instantiate ACE_Map_Reverse_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>
+#pragma instantiate ACE_Node<TAO_POA *>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile
index 77a74e3b28c..f88d505c6d0 100644
--- a/TAO/tests/Makefile
+++ b/TAO/tests/Makefile
@@ -8,7 +8,10 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-DIRS  = Cubit \
+DIRS  = \
+	Cubit \
+	POA \
+	Param_Test \
 	Thruput
 
 # The following test hasn't been updated yet
diff --git a/TAO/tests/POA/FindPOA/FindPOA.cpp b/TAO/tests/POA/FindPOA/FindPOA.cpp
index ba13eb26e66..c907a58f650 100644
--- a/TAO/tests/POA/FindPOA/FindPOA.cpp
+++ b/TAO/tests/POA/FindPOA/FindPOA.cpp
@@ -15,7 +15,7 @@ main (int argc, char **argv)
 
   CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
-  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj, env);
+  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in(), env);
   if (env.exception () != 0)
     {
       env.print_exception ("PortableServer::POA::_narrow");
@@ -30,7 +30,7 @@ main (int argc, char **argv)
       return -1;
     }
   
-  root_poa->the_activator (activator, env);
+  root_poa->the_activator (activator.in (), env);
   if (env.exception () != 0)
     {
       env.print_exception ("PortableServer::POA::the_activator");
diff --git a/TAO/tests/POA/FindPOA/Makefile b/TAO/tests/POA/FindPOA/Makefile
index 775684e5f2e..731b7853b13 100644
--- a/TAO/tests/POA/FindPOA/Makefile
+++ b/TAO/tests/POA/FindPOA/Makefile
@@ -6,9 +6,10 @@ BIN = FindPOA
 
 LSRC = 	$(addsuffix .cpp,$(BIN))
 
-CPPFLAGS += -I$(ACE_ROOT)/TAO
+CPPFLAGS += -I$(TAO_ROOT)
 
 LDLIBS     =  -lTAO
+LDFLAGS += -L$(TAO_ROOT)/tao
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
@@ -22,6 +23,7 @@ INSTALL =
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/tests/POA/Makefile b/TAO/tests/POA/Makefile
new file mode 100644
index 00000000000..e71ba4edacc
--- /dev/null
+++ b/TAO/tests/POA/Makefile
@@ -0,0 +1,30 @@
+#----------------------------------------------------------------------------
+#	@(#)Makefile	1.1	10/18/96
+#
+#	Makefile for the TAO tests
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
+#----------------------------------------------------------------------------
+
+DIRS  = Explicit_Activation \
+	FindPOA \
+	Generic_Servant \
+	NewPOA \
+	On_Demand_Activation \
+	RootPOA
+
+# The following test hasn't been updated yet
+# Demux_Test
+
+#----------------------------------------------------------------------------
+#	Include macros and targets
+#----------------------------------------------------------------------------
+
+include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
+
diff --git a/TAO/tests/POA/NewPOA/Makefile b/TAO/tests/POA/NewPOA/Makefile
index c90873f1d07..eece9f148e9 100644
--- a/TAO/tests/POA/NewPOA/Makefile
+++ b/TAO/tests/POA/NewPOA/Makefile
@@ -6,9 +6,10 @@ BIN = NewPOA
 
 LSRC = 	$(addsuffix .cpp,$(BIN))
 
-CPPFLAGS += -I$(ACE_ROOT)/TAO
+CPPFLAGS += -I$(TAO_ROOT)
 
 LDLIBS     =  -lTAO
+LDFLAGS += -L$(TAO_ROOT)/tao
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
@@ -22,6 +23,7 @@ INSTALL =
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
diff --git a/TAO/tests/POA/NewPOA/NewPOA.cpp b/TAO/tests/POA/NewPOA/NewPOA.cpp
index f02fa7c5670..628b6f52041 100644
--- a/TAO/tests/POA/NewPOA/NewPOA.cpp
+++ b/TAO/tests/POA/NewPOA/NewPOA.cpp
@@ -15,7 +15,7 @@ main (int argc, char **argv)
 
   CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
-  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj, env);
+  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in(), env);
   if (env.exception () != 0)
     {
       env.print_exception ("PortableServer::POA::_narrow");
diff --git a/TAO/tests/POA/RootPOA/Makefile b/TAO/tests/POA/RootPOA/Makefile
index 8b405256046..66687935b3b 100644
--- a/TAO/tests/POA/RootPOA/Makefile
+++ b/TAO/tests/POA/RootPOA/Makefile
@@ -6,9 +6,10 @@ BIN = RootPOA
 
 LSRC = 	$(addsuffix .cpp,$(BIN))
 
-CPPFLAGS += -I$(ACE_ROOT)/TAO
+CPPFLAGS += -I$(TAO_ROOT)
 
 LDLIBS     =  -lTAO
+LDFLAGS += -L$(TAO_ROOT)/tao
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
diff --git a/TAO/tests/POA/RootPOA/RootPOA.cpp b/TAO/tests/POA/RootPOA/RootPOA.cpp
index 89827656f91..40acaf4b170 100644
--- a/TAO/tests/POA/RootPOA/RootPOA.cpp
+++ b/TAO/tests/POA/RootPOA/RootPOA.cpp
@@ -15,7 +15,7 @@ main (int argc, char **argv)
 
   CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
-  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj, env);
+  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in(), env);
   if (env.exception () != 0)
     {
       env.print_exception ("PortableServer::POA::_narrow");
diff --git a/TAO/tests/README b/TAO/tests/README
index 86825081c8e..bc68c840e63 100644
--- a/TAO/tests/README
+++ b/TAO/tests/README
@@ -13,3 +13,11 @@ The individual directories contain READMEs on how to run the tests.
 
          Cubit example. The servant returns the cube of the number
          sent to it by the client.
+
+    . POA
+
+         Contains various small tests of POA features.
+
+    . Param_Test
+
+         Tests features of the typecode interpreter.