Changes for building on VxWorks. Modified by Brian Mendel.

9 files changed, 63 insertions, 28 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 1b51682253f..326076ac380 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,31 @@
+Tue Sep 02 18:32:12 1997  Brian Mendel  <brian.r.mendel@boeing.com>
+
+   * tao/orbobj.cpp:  Added include for Service_Repository.h to orbobj.h
+   
+   * tao/debug.cpp:  Removed the TAO_NEEDS_UNUSED_VARIABLES #defines 
+     around the debug_stream declaration.  debug_stream is used by 
+     dmsg_filter in debug.cpp.  Changed SYSTEM_EXCEPTION to 
+     CORBA::SYSTEM_EXCEPTION. 
+
+   * tao/default_client.cpp: Removed extra parameter from ACE_Hash_Map_Entry
+     #pragma instantiate statement.
+
+   * tao/objtable.cpp:  Deleted pragmas for instantiating ACE_Guard,
+     ACE_Read_Guard, and ACE_Write_Guard to eliminate duplicate
+     instantiations.  Also, removed the instantiations from 
+     ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION for the same reason.
+
+   * tao/orbobj.cpp: Added a typecast to void * in argvec_shift method.
+
+   * tao/default.bld - Modified VxWorks Build File to change template instantiation
+     modes.
+
+   * tao/tao.bld - Added default_client.cpp, default_server.cpp, client_factory.cpp, and
+     server_factory.cpp to the VxWorks build file.
+
+   * tao/tao.dsp - Added default_client.cpp, default_server.cpp, client_factory.cpp, and 
+     server_factory.cpp to the Win NT project file.
+
 Tue Sep  2 07:31:45 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
 	* tao/orbobj.cpp (ORB_init): VxWorks doesn't use
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index 503cd8c6351..fc8deef7c31 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -25,9 +25,8 @@
 
 u_int ACE_Svc_Export TAO_debug_level	= 0;
 char * ACE_Svc_Export TAO_debug_filter	= "l";
-#if defined(TAO_NEEDS_UNUSED_VARIABLES)
+
 static FILE *debug_stream = stderr;
-#endif /* TAO_NEEDS_UNUSED_VARIABLES */
 
 // The rest of this file is not needed without -DDEBUG, and unless the
 // vfprintf () call is available it can't work.
@@ -207,7 +206,7 @@ _dmsg_x (CORBA::Environment _FAR	&env,
   flockfile (debug_stream);
   emit_prefix (debug_stream);
   ACE_OS::fprintf (debug_stream, "exception '%s' at '%s'\n", ex->id (), info);
-  if (env.exception_type () == SYSTEM_EXCEPTION) 
+  if (env.exception_type () == CORBA::SYSTEM_EXCEPTION) 
     {
       CORBA::SystemException *sysex = (CORBA::SystemException *) ex;
 
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index d8115a08664..b1dfcb47f01 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -78,7 +78,7 @@ template class ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler
 #pragma instantiate ACE_Creation_Strategy<TAO_Client_Connection_Handler>
 #pragma instantiate ACE_Connect_Strategy<TAO_Client_Connection_Handler, ACE_SOCK_CONNECTOR>
 //#pragma instantiate TAO_HASH_ADDR
-#pragma instantiate ACE_Hash_Map_Entry<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>
+#pragma instantiate ACE_Hash_Map_Entry<TAO_HASH_ADDR, TAO_Client_Connection_Handler *>
 #pragma instantiate ACE_Hash_Map_Manager<TAO_HASH_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_RW_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
diff --git a/TAO/tao/objtable.cpp b/TAO/tao/objtable.cpp
index 70e28ce5dca..89a4893eec9 100644
--- a/TAO/tao/objtable.cpp
+++ b/TAO/tao/objtable.cpp
@@ -205,14 +205,8 @@ TAO_Active_Demux_ObjTable_Entry::~TAO_Active_Demux_ObjTable_Entry (void)
 template class ACE_Hash_Map_Iterator<char const*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Manager<char const*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>;
 template class ACE_Hash_Map_Entry<char const*, CORBA::Object_ptr>;
-template class ACE_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Iterator<char const*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Manager<char const*, CORBA::Object_ptr, ACE_SYNCH_RW_MUTEX>
 #pragma instantiate ACE_Hash_Map_Entry<char const*, CORBA::Object_ptr>
-#pragma instantiate ACE_Guard<ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Read_Guard<ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Write_Guard<ACE_SYNCH_RW_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/orbobj.cpp b/TAO/tao/orbobj.cpp
index aee034e590b..9b0f5f75e60 100644
--- a/TAO/tao/orbobj.cpp
+++ b/TAO/tao/orbobj.cpp
@@ -26,6 +26,7 @@
 
 #include "tao/corba.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Service_Repository.h"
 
 extern void __TC_init_table (void);
 extern void __TC_init_standard_exceptions (CORBA::Environment &env);
@@ -126,8 +127,8 @@ CORBA_ORB::Release (void)
 inline static void
 argvec_shift (int& argc, char *const *argv, int numslots)
 {
-  ACE_OS::memmove (&argv[0],
-		   &argv[numslots],
+  ACE_OS::memmove ((void *) &argv[0],
+		   (void *) &argv[numslots],
 		   (argc - numslots) * sizeof argv[0]);
   argc -= numslots;
 }
diff --git a/TAO/tao/tao.bld b/TAO/tao/tao.bld
index 5ed5b052563..bfaf7dbb9f5 100644
--- a/TAO/tao/tao.bld
+++ b/TAO/tao/tao.bld
@@ -6,9 +6,10 @@ any.cpp
 	C++
 boa.cpp
 	C++
-	:cx_e_option=noremark
 cdr.cpp
 	C++
+client_factory.cpp
+	C++
 connect.cpp
 	C++
 corbacom.cpp
@@ -19,12 +20,16 @@ decode.cpp
 	C++
 deep_copy.cpp
 	C++
+deep_free.cpp
+	C++
+default_client.cpp
+	C++
+default_server.cpp
+	C++
 encode.cpp
 	C++
 except.cpp
 	C++
-factories.cpp
-	C++
 giop.cpp
 	C++
 iiopobj.cpp
@@ -55,11 +60,11 @@ request.cpp
 	C++
 roa.cpp
 	C++
+server_factory.cpp
+	C++
 svrrqst.cpp
 	C++
 tc_const.cpp
 	C++
 typecode.cpp
 	C++
-deep_free.cpp
-	C++
diff --git a/TAO/tests/Cubit/Build/clnt.bld b/TAO/tests/Cubit/Build/clnt.bld
index 76e60ef8967..a3d08eaec45 100755
--- a/TAO/tests/Cubit/Build/clnt.bld
+++ b/TAO/tests/Cubit/Build/clnt.bld
@@ -2,7 +2,7 @@
 default:
 	program
 	:debuglevel=multi
-../cubit.cpp
+../TAO/clnt.cpp
 	C++
-../clnt.cpp
+cubitC.cpp
 	C++
diff --git a/TAO/tests/Cubit/Build/default.bld b/TAO/tests/Cubit/Build/default.bld
index cdf3e2e8210..b55665685e3 100755
--- a/TAO/tests/Cubit/Build/default.bld
+++ b/TAO/tests/Cubit/Build/default.bld
@@ -1,19 +1,25 @@
 #!build
 default:
 	nobuild
-	:debuglevel=multi
+	:cx_e_option=msgnumbers
 	:target=vxwppc
+	:cx_silent=21
+	:cx_silent=191
+	:cx_silent=610
+	:sourcedirs=../../..
 	:sourcedirs=/home/ace/ACE_wrappers.vxworks
-	:sourcedirs=../../proto/include
-	:sourcedirs=../..
-	:libraries=../../proto/lib/tao.a
-	:libraries=/home/ace/ACE_wrappers.vxworks/ace/libACE.a
+	:sourcedirs=../../..
+	:sourcedirs=../TAO
+	:sourcedirs=../../../tao/compat
+	:libdirs=../../../tao
+	:libdirs=/home/ace/ACE_wrappers.vxworks/ace
+	:libraries=tao.a
+	:libraries=libACE.a
 	:libraries=/appl/newgreen/vxppc603/indlib.o
 	:defines=DEBUG
+	:defines=FORCE_ARGS
 clnt.bld
 	program
-	:debuglevel=multi
 svr.bld
 	program
-	:debuglevel=multi
 	:defines=USE_ACE_EVENT_HANDLING
diff --git a/TAO/tests/Cubit/Build/svr.bld b/TAO/tests/Cubit/Build/svr.bld
index 7c8725356b2..e15046c5d41 100755
--- a/TAO/tests/Cubit/Build/svr.bld
+++ b/TAO/tests/Cubit/Build/svr.bld
@@ -2,7 +2,9 @@
 default:
 	program
 	:debuglevel=multi
-../svr.cpp
+../TAO/svr.cpp
 	C++
-../cubit.cpp
+cubit_i.cpp
+	C++
+cubitS.cpp
 	C++