diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/ace_dsui_events.ns /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/ace_dsui_events.ns --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/ace_dsui_events.ns 1969-12-31 18:00:00.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/ace_dsui_events.ns 2005-05-27 12:28:21.000000000 -0500 @@ -0,0 +1,12 @@ +#!lib.parsers.ns_parser_v1 +namespace { + desc = "converted from old-style config." + family ACE_DSUI_EVENTS 25 { + desc = "" + shortdesc = "Events that happen in the ACE" + event AFTER_COND_WAIT 0 { + printf = "" + shortdesc = "print_string " + } + } +} diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/ace.mpc /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/ace.mpc --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/ace.mpc 2004-04-03 08:25:48.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/ace.mpc 2005-05-27 12:28:21.000000000 -0500 @@ -6,6 +6,12 @@ sharedname = ACE dynamicflags = ACE_BUILD_DLL ACE_OS_BUILD_DLL + verbatim(gnuace, bottom) { + dsui_headers: + " $(DSUI_PATH)/utils/dsui-parse.py -n ace_dsui_events.ns -t ace -z $(DSUI_PATH)/utils/dstream_admin.ns + } +// " gcc $(CPPFLAGS) -c ace_dsui_vars.c + // This mpc file could be greatly simplified by putting the separate components // in subdirectories. @@ -71,6 +77,8 @@ Copy_Disabled.cpp Date_Time.cpp gethrtime.cpp + sys_call_hooks.cpp + ace_dsui_vars.cpp } Utils { diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/OS_NS_sys_select.inl /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/OS_NS_sys_select.inl --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/OS_NS_sys_select.inl 2004-04-03 08:25:48.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/OS_NS_sys_select.inl 2005-05-27 12:28:21.000000000 -0500 @@ -4,6 +4,7 @@ #include "ace/os_include/os_errno.h" #include "ace/Time_Value.h" #include "ace/OS_NS_macros.h" +#include "ace/sys_call_hooks.h" // It would be really cool to add another version of select that would // function like the one we're defending against below! @@ -12,6 +13,7 @@ fd_set *rfds, fd_set *wfds, fd_set *efds, const ACE_Time_Value *timeout) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::select"); #if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL) // We must defend against non-conformity! diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/OS_NS_sys_socket.inl /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/OS_NS_sys_socket.inl --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/OS_NS_sys_socket.inl 2004-04-03 08:25:48.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/OS_NS_sys_socket.inl 2005-05-27 12:28:21.000000000 -0500 @@ -7,6 +7,7 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_QoS.h" #include "ace/Global_Macros.h" +#include "ace/sys_call_hooks.h" #if defined (ACE_HAS_VOIDPTR_SOCKOPT) typedef void *ACE_SOCKOPT_TYPE1; @@ -21,6 +22,7 @@ struct sockaddr *addr, int *addrlen) { + SysCallGuard gd("ACE_OS::accept"); ACE_OS_TRACE ("ACE_OS::accept"); #if defined (ACE_PSOS) # if !defined (ACE_PSOS_DIAB_PPC) @@ -122,6 +124,7 @@ struct sockaddr *addr, int addrlen) { + SysCallGuard gd("ACE_OS::connect"); ACE_OS_TRACE ("ACE_OS::connect"); #if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC) ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle, @@ -213,6 +216,7 @@ ACE_INLINE int ACE_OS::listen (ACE_HANDLE handle, int backlog) { + SysCallGuard gd("ACE_OS::listen"); ACE_OS_TRACE ("ACE_OS::listen"); ACE_SOCKCALL_RETURN (::listen ((ACE_SOCKET) handle, backlog), int, -1); } @@ -220,6 +224,7 @@ ACE_INLINE int ACE_OS::recv (ACE_HANDLE handle, char *buf, size_t len, int flags) { + SysCallGuard gd("ACE_OS::recv"); ACE_OS_TRACE ("ACE_OS::recv"); // On UNIX, a non-blocking socket with no data to receive, this @@ -251,6 +256,7 @@ struct sockaddr *addr, int *addrlen) { + SysCallGuard gd("ACE_OS::recvfrom"); ACE_OS_TRACE ("ACE_OS::recvfrom"); #if defined (ACE_PSOS) # if !defined ACE_PSOS_DIAB_PPC @@ -299,6 +305,7 @@ ACE_OVERLAPPED *overlapped, ACE_OVERLAPPED_COMPLETION_FUNC func) { + SysCallGuard gd("ACE_OS::recvfrom"); ACE_OS_TRACE ("ACE_OS::recvfrom"); #if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) @@ -336,6 +343,7 @@ ACE_INLINE int ACE_OS::recvmsg (ACE_HANDLE handle, struct msghdr *msg, int flags) { + SysCallGuard gd("ACE_OS::recvmsg"); ACE_OS_TRACE ("ACE_OS::recvmsg"); #if !defined (ACE_LACKS_RECVMSG) # if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) @@ -430,6 +438,7 @@ ACE_INLINE int ACE_OS::send (ACE_HANDLE handle, const char *buf, size_t len, int flags) { + SysCallGuard gd("ACE_OS::send"); ACE_OS_TRACE ("ACE_OS::send"); // On UNIX, a non-blocking socket with no data to receive, this @@ -464,6 +473,7 @@ const struct msghdr *msg, int flags) { + SysCallGuard gd("ACE_OS::sendmsg"); ACE_OS_TRACE ("ACE_OS::sendmsg"); #if !defined (ACE_LACKS_SENDMSG) # if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) @@ -507,6 +517,7 @@ const struct sockaddr *addr, int addrlen) { + SysCallGuard gd("ACE_OS::sendto"); ACE_OS_TRACE ("ACE_OS::sendto"); #if defined (VXWORKS) ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle, (char *) buf, len, flags, @@ -595,6 +606,7 @@ const iovec *buffers, int n) { + SysCallGuard gd("ACE_OS::sendv"); #if defined (ACE_HAS_WINSOCK2) DWORD bytes_sent = 0; int result = 0; diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/OS_NS_Thread.cpp /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/OS_NS_Thread.cpp --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/OS_NS_Thread.cpp 2004-04-03 08:25:48.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/OS_NS_Thread.cpp 2005-05-27 12:28:21.000000000 -0500 @@ -1146,6 +1146,7 @@ int ACE_OS::cond_broadcast (ACE_cond_t *cv) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_broadcast"); # if defined (ACE_HAS_THREADS) // The must be locked before this call is made. @@ -1289,6 +1290,7 @@ int ACE_OS::cond_signal (ACE_cond_t *cv) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_signal"); # if defined (ACE_HAS_THREADS) // If there aren't any waiters, then this is a no-op. Note that @@ -1315,6 +1317,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, ACE_mutex_t *external_mutex) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_wait"); # if defined (ACE_HAS_THREADS) // Prevent race conditions on the count. @@ -1410,6 +1413,7 @@ ACE_mutex_t *external_mutex, ACE_Time_Value *timeout) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_timedwait"); # if defined (ACE_HAS_THREADS) // Handle the easy case first. @@ -1598,6 +1602,7 @@ ACE_thread_mutex_t *external_mutex, ACE_Time_Value *timeout) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_timedwait"); # if defined (ACE_HAS_THREADS) // Handle the easy case first. @@ -1690,6 +1695,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, ACE_thread_mutex_t *external_mutex) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_wait"); # if defined (ACE_HAS_THREADS) ACE_OS::thread_mutex_lock (&cv->waiters_lock_); diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/OS_NS_Thread.inl /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/OS_NS_Thread.inl --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/OS_NS_Thread.inl 2004-04-03 08:25:48.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/OS_NS_Thread.inl 2005-05-27 15:27:30.000000000 -0500 @@ -10,10 +10,20 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_errno.h" +#include "ace/sys_call_hooks.h" #if defined (ACE_HAS_PRIOCNTL) # include /**/ #endif /* ACE_HAS_PRIOCNTL */ +#ifndef CONFIG_DSUI +#define CONFIG_DSUI +#endif +#define CONFIG_DSTREAM_ACE_DSUI_EVENTS +#include +#include "ace/ace_dsui_table.h" +#include +#include + /*****************************************************************************/ #if defined (ACE_LACKS_COND_T) && defined (ACE_HAS_THREADS) @@ -285,6 +295,7 @@ ACE_INLINE int ACE_OS::cond_broadcast (ACE_cond_t *cv) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_broadcast"); # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) @@ -416,6 +427,7 @@ ACE_INLINE int ACE_OS::cond_signal (ACE_cond_t *cv) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_signal"); # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) @@ -441,6 +453,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, ACE_mutex_t *external_mutex) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_wait"); # if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) @@ -470,11 +483,13 @@ ACE_mutex_t *external_mutex, ACE_Time_Value *timeout) { + SysCallGuard gd; ACE_OS_TRACE ("ACE_OS::cond_timedwait"); # if defined (ACE_HAS_THREADS) int result; timespec_t ts; + if (timeout != 0) ts = *timeout; // Calls ACE_Time_Value::operator timespec_t(). @@ -559,6 +574,9 @@ } } + DSTRM_EVENT(ACE_DSUI_EVENTS, AFTER_COND_WAIT, + ACE_OS::getpid(), 0, NULL); + return result; # endif /* ACE_HAS_STHREADS */ @@ -1139,6 +1157,7 @@ ACE_INLINE int ACE_OS::event_wait (ACE_event_t *event) { + SysCallGuard gd; #if defined (ACE_WIN32) switch (::WaitForSingleObject (*event, INFINITE)) { @@ -1289,6 +1308,7 @@ ACE_INLINE int ACE_OS::mutex_lock (ACE_mutex_t *m) { + SysCallGuard gd; // ACE_OS_TRACE ("ACE_OS::mutex_lock"); #if defined (ACE_HAS_THREADS) # if defined (ACE_HAS_PTHREADS) @@ -1389,6 +1409,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m, const ACE_Time_Value &timeout) { + SysCallGuard gd; #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_MUTEX_TIMEOUTS) # if defined (ACE_HAS_PTHREADS) diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/sys_call_hooks.cpp /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/sys_call_hooks.cpp --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/sys_call_hooks.cpp 1969-12-31 18:00:00.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/sys_call_hooks.cpp 2005-05-27 12:28:21.000000000 -0500 @@ -0,0 +1,27 @@ +#include "ace/sys_call_hooks.h" +#include "ace/Log_Msg.h" + +auto_ptr sys_call_hooks; + +void init_ace_sys_call_hooks (auto_ptr& hooks) +{ + sys_call_hooks = hooks; +} + +SysCallGuard::SysCallGuard (char* syscall) +{ + if (sys_call_hooks.get () == 0) return; + //if (syscall != 0) + // ACE_DEBUG ((LM_DEBUG, "syscall %s entered\n", syscall)); + sys_call_hooks->sys_call_entered (); +} + +SysCallGuard::~SysCallGuard () +{ + if (sys_call_hooks.get () == 0) return; + sys_call_hooks->sys_call_exited (); +} + +SysCallHooks::~SysCallHooks () +{ +} diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/sys_call_hooks.h /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/sys_call_hooks.h --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/sys_call_hooks.h 1969-12-31 18:00:00.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/sys_call_hooks.h 2005-05-27 12:28:21.000000000 -0500 @@ -0,0 +1,23 @@ +#ifndef SYSCALLHOOKS_H +#define SYSCALLHOOKS_H + +#include "ace/Auto_Ptr.h" + +class SysCallHooks +{ + public: + virtual void sys_call_entered ()=0; + virtual void sys_call_exited ()=0; + virtual ~SysCallHooks (); +}; + +class SysCallGuard +{ + public: + SysCallGuard (char* syscall=0); + virtual ~SysCallGuard (); +}; + +void init_ace_sys_call_hooks (auto_ptr& hooks); + +#endif diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/Task.cpp /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/Task.cpp --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/Task.cpp 2004-04-03 08:25:48.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/Task.cpp 2005-06-10 11:24:29.000000000 -0500 @@ -2,6 +2,14 @@ #include "ace/Task.h" #include "ace/Module.h" +#include "ace/OS_NS_unistd.h" + +#include +#include + +_syscall0(pid_t,gettid) + + pid_t gettid(void); #if !defined (__ACE_INLINE__) #include "ace/Task.i" @@ -15,10 +23,13 @@ ACE_Task_Base::ACE_Task_Base (ACE_Thread_Manager *thr_man) : thr_count_ (0), + all_pids_added_cv_ (pids_lock_), thr_mgr_ (thr_man), flags_ (0), grp_id_ (-1) { + pids_.count = 0; + //pids_.pids = 0; } // Wait for all threads running in a task to exit. @@ -73,6 +84,7 @@ ACE_thread_t thread_ids[]) { ACE_TRACE ("ACE_Task_Base::activate"); + // pids_.pids = new pid_t[n_threads]; #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1); @@ -160,6 +172,27 @@ #endif /* ACE_MT_SAFE */ } +ACE_Task_Base::pids_t +ACE_Task_Base::get_pids () +{ + ACE_Guard guard(pids_lock_); + + while (pids_.count < thr_count_) + all_pids_added_cv_.wait (); + + return pids_; +} + +void +ACE_Task_Base::add_pid (pid_t pid) +{ + ACE_Guard guard(pids_lock_); + + pids_.pids[pids_.count++] = pid; + if (pids_.count == thr_count_) + all_pids_added_cv_.broadcast (); +} + void ACE_Task_Base::cleanup (void *object, void *) { @@ -189,6 +222,8 @@ ACE_Task_Base *t = (ACE_Task_Base *) args; + t->add_pid (gettid()); + // Register ourself with our 's thread exit hook // mechanism so that our close() hook will be sure to get invoked // when this thread exits. @@ -199,6 +234,7 @@ t->thr_mgr ()->at_exit (t, ACE_Task_Base::cleanup, 0); #endif /* ACE_HAS_SIG_C_FUNC */ + //ACE_DEBUG ((LM_DEBUG, "pid = %d\n", ACE_OS::getpid ())); // Call the Task's svc() hook method. int svc_status = t->svc (); ACE_THR_FUNC_RETURN status; diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/Task.h /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/Task.h --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/ace/Task.h 2004-04-03 08:25:48.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/ace/Task.h 2005-05-27 12:28:21.000000000 -0500 @@ -244,6 +244,14 @@ /// shutdown an . static void cleanup (void *object, void *params); + struct pids_t + { + size_t count; + pid_t pids[10]; + }; + + pids_t get_pids (); + // = Internal data (should be private...). // private: @@ -255,6 +263,15 @@ */ size_t thr_count_; + void add_pid (pid_t pid); + + typedef ACE_MT_SYNCH::MUTEX mutex_t; + typedef ACE_MT_SYNCH::CONDITION condition_t; + mutex_t pids_lock_; + condition_t all_pids_added_cv_; + + pids_t pids_; + /// Multi-threading manager. ACE_Thread_Manager *thr_mgr_; @@ -270,6 +287,7 @@ ACE_Thread_Mutex lock_; #endif /* ACE_MT_SAFE */ + private: // = Disallow these operations. diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/bin/MakeProjectCreator/config/acedefaults.mpb /projects/kurt/venkita/gs_expmts/ACE_wrappers/bin/MakeProjectCreator/config/acedefaults.mpb --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/bin/MakeProjectCreator/config/acedefaults.mpb 2004-04-03 08:25:48.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/bin/MakeProjectCreator/config/acedefaults.mpb 2005-05-27 12:28:21.000000000 -0500 @@ -5,4 +5,13 @@ staticflags += ACE_AS_STATIC_LIBS includes += $(ACE_ROOT) libpaths += $(ACE_ROOT)/lib + includes += $(DSUI_PATH)/lib + includes += $(KUSP_PATH)/src/datastreams/shared/lib + includes += $(DSKI_PATH)/libcppwrappers + includes += $(DSKI_PATH)/lib + includes += $(KUSP_PATH)/src/kernel/include + libpaths += $(DSUI_PATH)/lib + libpaths += $(DSUI_PATH)/libcppwrappers + libpaths += $(DSKI_PATH)/lib + libpaths += $(DSKI_PATH)/libcppwrappers } diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/TAO/gs_expmts.mwc /projects/kurt/venkita/gs_expmts/ACE_wrappers/TAO/gs_expmts.mwc --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/TAO/gs_expmts.mwc 1969-12-31 18:00:00.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/TAO/gs_expmts.mwc 2005-05-27 12:28:21.000000000 -0500 @@ -0,0 +1,9 @@ +// -*- MPC -*- +// TAOACE.mwc,v 1.7 2004/03/22 15:13:20 elliott_c Exp + +workspace { + ../ace + ../apps/gperf/src + tao + TAO_IDL +} diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/TAO/tao/Valuetype/ValueBase.h /projects/kurt/venkita/gs_expmts/ACE_wrappers/TAO/tao/Valuetype/ValueBase.h --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/TAO/tao/Valuetype/ValueBase.h 2004-04-03 08:25:50.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/TAO/tao/Valuetype/ValueBase.h 2005-05-27 12:28:21.000000000 -0500 @@ -22,6 +22,17 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +namespace CORBA +{ + class ValueFactoryBase; + typedef ValueFactoryBase *ValueFactory; + + class ValueBase; + + extern TAO_Valuetype_Export void add_ref (ValueBase *); + extern TAO_Valuetype_Export void remove_ref (ValueBase *); +} + #include "Value_VarOut_T.h" #include "tao/Object_Argument_T.h" @@ -40,14 +51,6 @@ namespace CORBA { - class ValueFactoryBase; - typedef ValueFactoryBase *ValueFactory; - - class ValueBase; - - extern TAO_Valuetype_Export void add_ref (ValueBase *); - extern TAO_Valuetype_Export void remove_ref (ValueBase *); - typedef TAO_Value_Var_T ValueBase_var; typedef TAO_Value_Out_T ValueBase_out; diff -u -r -N -X excludes.in /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/TAO/tao/Valuetype/Value_VarOut_T.cpp /projects/kurt/venkita/gs_expmts/ACE_wrappers/TAO/tao/Valuetype/Value_VarOut_T.cpp --- /projects/kurt/venkita/gs_expmts/ACE+TAO-1.4.1-orig/ACE_wrappers/TAO/tao/Valuetype/Value_VarOut_T.cpp 2004-04-03 08:25:50.000000000 -0600 +++ /projects/kurt/venkita/gs_expmts/ACE_wrappers/TAO/tao/Valuetype/Value_VarOut_T.cpp 2005-05-27 13:38:26.000000000 -0500 @@ -3,6 +3,7 @@ #ifndef TAO_VALUE_VAROUT_T_C #define TAO_VALUE_VAROUT_T_C +#include "ValueBase.h" #include "Value_VarOut_T.h" #include "tao/CORBA_methods.h"