diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-07-16 05:07:44 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-07-16 05:07:44 +0000 |
| commit | a5808ed7e36c1c71bb4f151964a4a1dcd3722440 (patch) | |
| tree | c7e6de0b1bf446bd983cd46ca38958ab80ed9a25 | |
| parent | 21bfd0c5ae64c89f50091058bd145f1c466e31ff (diff) | |
| download | ATCD-a5808ed7e36c1c71bb4f151964a4a1dcd3722440.tar.gz | |
ChangeLogTag:Thu Jul 16 00:00:20 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
99 files changed, 4282 insertions, 3026 deletions
diff --git a/TAO/Benchmark/Marshal_Test/TAO/Makefile b/TAO/Benchmark/Marshal_Test/TAO/Makefile index 048d0705dbc..845516695dd 100644 --- a/TAO/Benchmark/Marshal_Test/TAO/Makefile +++ b/TAO/Benchmark/Marshal_Test/TAO/Makefile @@ -45,7 +45,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark -I$(TAO_ROOT)/tao/compat +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/Benchmark server: $(addprefix $(VDIR),$(MARSHAL_SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 041ad36e23b..07b12b1ac1f 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,88 @@ +Thu Jul 16 00:00:20 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * Removed all the COM madness, TAO no longer uses the IUnknown + classes, QueryInterface(), AddRef() or Release(). The new + reference counting methods are called _incr_refcnt and + _decr_refcnt (the leading underscore is necessary for CORBA + complaince, but it breaks ANSI/C or ANSI/C++ complaince, yuk!). + This change save a few microseconds on the critical path, + because QueryInterface() was used in remote method invocation, + invoking many virtual methods, increasing the refcnt and then + decreasing it again; but the real motivations are: + + It was confusing to users it what way did TAO support COM (it + does not, yet). + + Removing QueryInterface() and the ref counting from the + critical path will allow us to protect the ref counts with + mutexes (strategized, of course). + + * tao/Any.cpp: + * tao/Any.h: + * tao/CurrentC.cpp: + * tao/Exception.cpp: + * tao/Exception.h: + * tao/IIOP_ORB.cpp: + * tao/IIOP_Object.cpp: + * tao/IIOP_Object.h: + * tao/Invocation.cpp: + * tao/Makefile: + * tao/Marshal.i: + * tao/NVList.cpp: + * tao/NVList.h: + * tao/ORB.cpp: + * tao/ORB.h: + * tao/ORB.i: + * tao/Object.cpp: + * tao/Object.h: + * tao/Object.i: + * tao/POAC.cpp: + * tao/PolicyC.cpp: + * tao/Principal.cpp: + * tao/Principal.h: + * tao/Request.cpp: + * tao/Request.h: + * tao/Server_Request.cpp: + * tao/Server_Request.h: + * tao/Server_Request.i: + * tao/Stub.h: + * tao/Typecode.cpp: + * tao/Typecode.h: + * tao/append.cpp: + * tao/corba.h: + * tao/decode.cpp: + * tao/deep_copy.cpp: + * tao/encode.cpp: + * tao/skip.cpp: + This are the files affected by the change. + + * tao/compat/initguid.h: + * tao/compat/objbase.h: + Removed! COM is gone from TAO. + + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: + * TAO_IDL/be/be_visitor_interface/interface_ss.cpp: + * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: + Generate the new CORBA_Object methods to gain access to the + STUB_Object, we don't generate the old COM methods. + + * taoconfig.mk: + Removed -I$(TAO_ROOT)/tao/compat + + * Makefiles: + Updated the dependencies in all the Makfiles of TAO (due to the + removal of objbase.h & friends). Also fixed many problems in the + Makefiles, like missing SRC or LSRC lists, removed the + -I$(TAO_ROOT)/tao/compat includes, added missing TAO_ROOT + definitions, etc. + + * docs/releasenotes/ec.html: + Added the latest changes. + + * tests/Cubit/TAO/IDL_Cubit/client_i.cpp: + Fixed mismatched memory free (new vs. malloc). + + * orbsvcs/tests/Logger/client.h: + Fixed method declaration. + Wed Jul 15 22:17:20 1998 David L. Levine <levine@cs.wustl.edu> * tao/ORB_Core.cpp: added ACE_Unbounded_Set<ACE_SYNCH_CONDITION *>, diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 32e09f04cea..359a075a0cb 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -59,7 +59,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) os->incr_indent (); *os << "if (!CORBA::is_nil (obj))\n"; os->incr_indent (); - *os << "obj->AddRef ();\n"; + *os << "obj->_incr_refcnt ();\n"; os->decr_indent (); *os << be_nl; *os << "return obj;\n"; @@ -86,7 +86,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << ")" << be_uidt << be_uidt_nl << "{" << be_idt_nl; *os << node->name () << "_ptr new_obj = new " - << node->name () << "(obj->_get_parent ());" << be_nl + << node->name () << "(obj->_stubobj ());" << be_nl << "return new_obj;" << be_uidt_nl << "} // end of if" << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index 2323107b777..6fedb61bb58 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -210,7 +210,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "_tao_skel_environment," << be_nl << "&" << node->flatname () << "_non_existent_calldata, " << be_nl << "&_tao_retval " << be_uidt_nl - << ");" << be_nl; + << ");" << be_uidt_nl; *os << "}\n\n"; os->indent (); diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index dd699bc411d..a30bffd40fe 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -296,7 +296,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node) { // Generate code that retrieves the underlying stub object and then // invokes do_static_call on it. - *os << "STUB_Object *istub = this->stubobj (_tao_environment);" << be_nl + *os << "STUB_Object *istub = this->_stubobj ();" << be_nl << "if (istub)" << be_nl << "{\n"; os->incr_indent (0); diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html index c34cfbacad1..6f84f2ec177 100644 --- a/TAO/docs/releasenotes/ec.html +++ b/TAO/docs/releasenotes/ec.html @@ -16,34 +16,15 @@ <UL> <LI> - The user can register a set of <CODE>EC_Gateways</CODE> with - the <CODE>EventChannel</CODE> implementation, the event - channel will automatically update the subscription list as - consumers subscribe to the EC. - </LI> - <LI> - The code for consumer and supplier disconnection was - improved and seems to work without problems now + Added a prototype Consumer and Supplier that can send events + though multicast groups (or regular UDP sockets). </LI> <LI> - The <CODE>Event_Service</CODE> program creates a collocated - <CODE>Scheduling Service</CODE> this works around a problem - in the ORB when running on multiprocessor. - </LI> - <LI> - Startup and shutdown were revised, the event channel - shutdown cleanly now. - </LI> - <LI> - Added yet another example - (<CODE>$TAO_ROOT/orbsvcs/tests/EC_Throughput</CODE>), this - one ilustrate how to use the - TAO extensions to create octet sequences based on CDR - streams, without incurring in extra copies. - This is useful to implement custom marshalling or late - dermashalling of the event payload. - Future versions of the test will help measuring the EC - throughput, hence the name. + The Event Channel can be configured using a Factory that + constructs the right modules (like changing the dispatching + module), + in the current release only the default Factory is + implemented. </LI> </UL> @@ -216,6 +197,37 @@ $ cd tests/Event_Latency ; ./Event_Latency -ORBport 0 -m 20 -j & moved from a test to the library. The corresponding test (<CODE>EC_Multiple</CODE>) has been expanded and improved.</LI> + + <LI> + The user can register a set of <CODE>EC_Gateways</CODE> with + the <CODE>EventChannel</CODE> implementation, the event + channel will automatically update the subscription list as + consumers subscribe to the EC. + </LI> + <LI> + The code for consumer and supplier disconnection was + improved and seems to work without problems now + </LI> + <LI> + The <CODE>Event_Service</CODE> program creates a collocated + <CODE>Scheduling Service</CODE> this works around a problem + in the ORB when running on multiprocessor. + </LI> + <LI> + Startup and shutdown were revised, the event channel + shutdown cleanly now. + </LI> + <LI> + Added yet another example + (<CODE>$TAO_ROOT/orbsvcs/tests/EC_Throughput</CODE>), this + one ilustrate how to use the + TAO extensions to create octet sequences based on CDR + streams, without incurring in extra copies. + This is useful to implement custom marshalling or late + dermashalling of the event payload. + Future versions of the test will help measuring the EC + throughput, hence the name. + </LI> </UL> </BODY> diff --git a/TAO/examples/Simulator/DOVEMIB/Makefile b/TAO/examples/Simulator/DOVEMIB/Makefile index adb4351eb4a..6d35e8d96e3 100644 --- a/TAO/examples/Simulator/DOVEMIB/Makefile +++ b/TAO/examples/Simulator/DOVEMIB/Makefile @@ -46,7 +46,7 @@ include $(TAO_ROOT)/taoconfig.mk #---------------------------------------------------------------------------- LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H $(IDL_SRC): NavWeap.idl $(TAO_ROOT)/TAO_IDL/tao_idl NavWeap.idl @@ -61,11 +61,13 @@ realclean: clean # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/DOVEMIB.o .obj/DOVEMIB.so .shobj/DOVEMIB.o .shobj/DOVEMIB.so: DOVEMIB.cpp $(ACE_ROOT)/ace/Get_Opt.h \ +.obj/DOVEMIB.o .obj/DOVEMIB.so .shobj/DOVEMIB.o .shobj/DOVEMIB.so: DOVEMIB.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -85,8 +87,6 @@ realclean: clean $(ACE_ROOT)/ace/High_Res_Timer.h \ $(ACE_ROOT)/ace/High_Res_Timer.i \ $(ACE_ROOT)/ace/Profile_Timer.i \ - $(TAO_ROOT)/tao/Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ $(TAO_ROOT)/tao/corba.h \ @@ -181,8 +181,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -213,8 +215,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -224,22 +224,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -269,6 +259,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -277,6 +269,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -284,6 +285,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -315,11 +318,13 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ AnyAnalyser.h PrintVisitor.h NodeVisitor.h Node.h -.obj/Node.o .obj/Node.so .shobj/Node.o .shobj/Node.so: Node.cpp Node.h $(TAO_ROOT)/tao/corba.h \ +.obj/Node.o .obj/Node.so .shobj/Node.o .shobj/Node.so: Node.cpp Node.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -425,8 +430,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -457,8 +464,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -468,22 +473,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -513,6 +508,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -521,6 +518,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -528,15 +534,19 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h NodeVisitor.h + $(TAO_ROOT)/tao/singletons.h \ + NodeVisitor.h .obj/PrintVisitor.o .obj/PrintVisitor.so .shobj/PrintVisitor.o .shobj/PrintVisitor.so: PrintVisitor.cpp PrintVisitor.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -642,8 +652,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -674,8 +686,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -685,22 +695,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -730,6 +730,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -738,6 +740,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -745,16 +756,19 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h NodeVisitor.h \ - Node.h + $(TAO_ROOT)/tao/singletons.h \ + NodeVisitor.h Node.h .obj/AnyAnalyser.o .obj/AnyAnalyser.so .shobj/AnyAnalyser.o .shobj/AnyAnalyser.so: AnyAnalyser.cpp AnyAnalyser.h PrintVisitor.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ @@ -860,8 +874,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -892,8 +908,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -903,22 +917,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -948,6 +952,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -956,6 +962,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -963,9 +978,11 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h NodeVisitor.h \ - Node.h + $(TAO_ROOT)/tao/singletons.h \ + NodeVisitor.h Node.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile b/TAO/examples/Simulator/Event_Supplier/Makefile index 2f18c752ce0..95b59ec3d92 100644 --- a/TAO/examples/Simulator/Event_Supplier/Makefile +++ b/TAO/examples/Simulator/Event_Supplier/Makefile @@ -42,7 +42,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H #$(IDL_SRC): NavWeap.idl diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile index 034bc400b5c..6164dbb8cdb 100644 --- a/TAO/orbsvcs/Concurrency_Service/Makefile +++ b/TAO/orbsvcs/Concurrency_Service/Makefile @@ -10,7 +10,7 @@ BIN = Concurrency_Service -SVR_SRCS=Concurrency_Service.cpp +SRC=Concurrency_Service.cpp LDLIBS = -lorbsvcs -lTAO @@ -37,11 +37,257 @@ endif #TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - +.obj/Concurrency_Service.o .obj/Concurrency_Service.so .shobj/Concurrency_Service.o .shobj/Concurrency_Service.so: Concurrency_Service.cpp Concurrency_Service.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/tao/TAO.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile index 79590c3f134..9b968cd2faa 100644 --- a/TAO/orbsvcs/Dump_Schedule/Makefile +++ b/TAO/orbsvcs/Dump_Schedule/Makefile @@ -30,7 +30,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -191,7 +191,6 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile index 860a1da298c..7f6d86b19bb 100644 --- a/TAO/orbsvcs/Event_Service/Makefile +++ b/TAO/orbsvcs/Event_Service/Makefile @@ -28,7 +28,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -189,7 +189,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile index 9a68440d5d6..54f61588e25 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Makefile +++ b/TAO/orbsvcs/LifeCycle_Service/Makefile @@ -49,7 +49,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs \ - -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H + -I$(TAO_ROOT) $(TSS_ORB_FLAG) realclean: clean @@ -210,7 +210,6 @@ Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -458,7 +457,6 @@ Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -704,7 +702,6 @@ Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -927,7 +924,6 @@ Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile index 59abe6aa587..3b2ec90edab 100644 --- a/TAO/orbsvcs/Naming_Service/Makefile +++ b/TAO/orbsvcs/Naming_Service/Makefile @@ -37,7 +37,7 @@ endif #TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. @@ -189,7 +189,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_O $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile index 8016a9a9a4d..7ba57ef7407 100644 --- a/TAO/orbsvcs/Scheduling_Service/Makefile +++ b/TAO/orbsvcs/Scheduling_Service/Makefile @@ -31,7 +31,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -189,7 +189,6 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile index f8a3d2772dc..92fb0fa37ae 100644 --- a/TAO/orbsvcs/Trading_Service/Makefile +++ b/TAO/orbsvcs/Trading_Service/Makefile @@ -33,7 +33,7 @@ endif #TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG) \ +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) \ -DTAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG # DO NOT DELETE THIS LINE -- g++dep uses it. diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile index 7ff929767e2..36fb4886b5c 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile +++ b/TAO/orbsvcs/orbsvcs/Makefile @@ -156,7 +156,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- LDFLAGS += -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) .PRECIOUS: CosNamingC.cpp CosNamingS.cpp CosNamingC.h CosNamingS.h .PRECIOUS: CosTimeBaseC.cpp CosTimeBaseS.cpp CosTimeBaseC.h CosTimeBaseS.h @@ -333,7 +333,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -559,7 +558,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -784,7 +782,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1008,7 +1005,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1232,7 +1228,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1459,7 +1454,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1686,7 +1680,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1911,7 +1904,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2136,7 +2128,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2360,7 +2351,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2584,7 +2574,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2808,7 +2797,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3032,7 +3020,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3259,7 +3246,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3485,7 +3471,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3712,7 +3697,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3939,7 +3923,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4172,7 +4155,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4403,7 +4385,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4632,7 +4613,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4861,7 +4841,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5087,7 +5066,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5315,7 +5293,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5539,7 +5516,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5764,7 +5740,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5988,7 +5963,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6214,7 +6188,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6451,7 +6424,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6693,7 +6665,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6938,7 +6909,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7167,7 +7137,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7392,7 +7361,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7621,7 +7589,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7850,7 +7817,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8076,7 +8042,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8334,7 +8299,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8561,7 +8525,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8841,7 +8804,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9125,7 +9087,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9386,7 +9347,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9664,7 +9624,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9949,7 +9908,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -10223,7 +10181,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -10495,7 +10452,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -10753,7 +10709,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -11025,7 +10980,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -11294,7 +11248,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -11544,7 +11497,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -11778,7 +11730,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -12012,7 +11963,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -12246,7 +12196,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -12477,7 +12426,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -12705,7 +12653,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -12936,7 +12883,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -13168,7 +13114,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -13401,7 +13346,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -13638,7 +13582,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -13866,7 +13809,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -14097,7 +14039,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -14337,7 +14278,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -14590,7 +14530,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -14840,7 +14779,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -15073,7 +15011,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -15307,7 +15244,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -15544,7 +15480,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -15778,7 +15713,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -16012,7 +15946,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -16245,7 +16178,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -16477,7 +16409,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -16708,7 +16639,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -16941,7 +16871,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -17179,7 +17108,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -17415,7 +17343,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -17652,7 +17579,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile b/TAO/orbsvcs/tests/AVStreams/Makefile new file mode 100644 index 00000000000..b6329eed1a2 --- /dev/null +++ b/TAO/orbsvcs/tests/AVStreams/Makefile @@ -0,0 +1,25 @@ +#---------------------------------------------------------------------------- +# +# $Id$ +# +#---------------------------------------------------------------------------- + +#---------------------------------------------------------------------------- +# Local macros +#---------------------------------------------------------------------------- + +DIRS = benchmark \ + mpeg \ + server_discovery \ + sfp \ + +#---------------------------------------------------------------------------- +# 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/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile index 431a588ad85..d5c122dfa78 100644 --- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile @@ -19,6 +19,10 @@ BIN = server client #child BUILD = $(BIN) VLDLIBS = $(LDLIBS:%=%$(VAR)) +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + FILES = client server child DEFS = $(addsuffix .h,$(FILES)) LSRC = $(addsuffix .cpp,$(FILES)) @@ -36,13 +40,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - DCFLAGS = -g LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG) +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) server:$(addprefix $(VDIR),$(SERVER_OBJS)) @@ -62,154 +62,154 @@ realclean: clean # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.h \ - $(ACE_ROOT)ace/Reactor.h \ - $(ACE_ROOT)ace/Handle_Set.h \ - $(ACE_ROOT)ace/ACE.h \ - $(ACE_ROOT)ace/OS.h \ - $(ACE_ROOT)ace/inc_user_config.h \ - $(ACE_ROOT)ace/config.h \ - $(ACE_ROOT)ace/config-sunos5.5.h \ - $(ACE_ROOT)ace/config-g++-common.h \ - $(ACE_ROOT)ace/streams.h \ - $(ACE_ROOT)ace/Basic_Types.h \ - $(ACE_ROOT)ace/Basic_Types.i \ - $(ACE_ROOT)ace/OS.i \ - $(ACE_ROOT)ace/Trace.h \ - $(ACE_ROOT)ace/Log_Msg.h \ - $(ACE_ROOT)ace/Log_Record.h \ - $(ACE_ROOT)ace/ACE.i \ - $(ACE_ROOT)ace/Log_Priority.h \ - $(ACE_ROOT)ace/Log_Record.i \ - $(ACE_ROOT)ace/Handle_Set.i \ - $(ACE_ROOT)ace/Timer_Queue.h \ - $(ACE_ROOT)ace/Synch.h \ - $(ACE_ROOT)ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)ace/Synch.i \ - $(ACE_ROOT)ace/Synch_T.h \ - $(ACE_ROOT)ace/Event_Handler.h \ - $(ACE_ROOT)ace/Event_Handler.i \ - $(ACE_ROOT)ace/Synch_T.i \ - $(ACE_ROOT)ace/Thread.h \ - $(ACE_ROOT)ace/Thread.i \ - $(ACE_ROOT)ace/Atomic_Op.i \ - $(ACE_ROOT)ace/Synch_T.cpp \ - $(ACE_ROOT)ace/Timer_Queue_T.h \ - $(ACE_ROOT)ace/Free_List.h \ - $(ACE_ROOT)ace/Free_List.i \ - $(ACE_ROOT)ace/Free_List.cpp \ - $(ACE_ROOT)ace/Timer_Queue_T.i \ - $(ACE_ROOT)ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)ace/Signal.h \ - $(ACE_ROOT)ace/Containers.h \ - $(ACE_ROOT)ace/Containers.i \ - $(ACE_ROOT)ace/Containers.cpp \ - $(ACE_ROOT)ace/Malloc.h \ - $(ACE_ROOT)ace/Malloc_Base.h \ - $(ACE_ROOT)ace/Malloc.i \ - $(ACE_ROOT)ace/Malloc_T.h \ - $(ACE_ROOT)ace/Malloc_T.i \ - $(ACE_ROOT)ace/Malloc_T.cpp \ - $(ACE_ROOT)ace/Memory_Pool.h \ - $(ACE_ROOT)ace/Mem_Map.h \ - $(ACE_ROOT)ace/Mem_Map.i \ - $(ACE_ROOT)ace/Memory_Pool.i \ - $(ACE_ROOT)ace/Signal.i \ - $(ACE_ROOT)ace/Object_Manager.h \ - $(ACE_ROOT)ace/Object_Manager.i \ - $(ACE_ROOT)ace/Managed_Object.h \ - $(ACE_ROOT)ace/Managed_Object.i \ - $(ACE_ROOT)ace/Managed_Object.cpp \ - $(ACE_ROOT)ace/Reactor.i \ - $(ACE_ROOT)ace/Reactor_Impl.h \ - $(ACE_ROOT)ace/ARGV.h \ - $(ACE_ROOT)ace/ARGV.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/ARGV.h \ + $(ACE_ROOT)/ace/ARGV.i \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)ace/Get_Opt.h \ - $(ACE_ROOT)ace/Get_Opt.i \ - $(ACE_ROOT)ace/SOCK_Stream.h \ - $(ACE_ROOT)ace/SOCK_IO.h \ - $(ACE_ROOT)ace/SOCK.h \ - $(ACE_ROOT)ace/Addr.h \ - $(ACE_ROOT)ace/Addr.i \ - $(ACE_ROOT)ace/IPC_SAP.h \ - $(ACE_ROOT)ace/IPC_SAP.i \ - $(ACE_ROOT)ace/SOCK.i \ - $(ACE_ROOT)ace/SOCK_IO.i \ - $(ACE_ROOT)ace/INET_Addr.h \ - $(ACE_ROOT)ace/INET_Addr.i \ - $(ACE_ROOT)ace/SOCK_Stream.i \ - $(ACE_ROOT)ace/Hash_Map_Manager.h \ - $(ACE_ROOT)ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)ace/Service_Config.h \ - $(ACE_ROOT)ace/Service_Object.h \ - $(ACE_ROOT)ace/Shared_Object.h \ - $(ACE_ROOT)ace/Shared_Object.i \ - $(ACE_ROOT)ace/Service_Object.i \ - $(ACE_ROOT)ace/SString.h \ - $(ACE_ROOT)ace/SString.i \ - $(ACE_ROOT)ace/Service_Config.i \ - $(ACE_ROOT)ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)ace/SOCK_Acceptor.h \ - $(ACE_ROOT)ace/Time_Value.h \ - $(ACE_ROOT)ace/SOCK_Acceptor.i \ - $(ACE_ROOT)ace/SOCK_Connector.h \ - $(ACE_ROOT)ace/SOCK_Connector.i \ - $(ACE_ROOT)ace/Strategies.h \ - $(ACE_ROOT)ace/Strategies_T.h \ - $(ACE_ROOT)ace/Synch_Options.h \ - $(ACE_ROOT)ace/Synch_Options.i \ - $(ACE_ROOT)ace/Strategies_T.i \ - $(ACE_ROOT)ace/Strategies_T.cpp \ - $(ACE_ROOT)ace/Service_Repository.h \ - $(ACE_ROOT)ace/Service_Types.h \ - $(ACE_ROOT)ace/Service_Types.i \ - $(ACE_ROOT)ace/Service_Repository.i \ - $(ACE_ROOT)ace/Thread_Manager.h \ - $(ACE_ROOT)ace/Thread_Manager.i \ - $(ACE_ROOT)ace/WFMO_Reactor.h \ - $(ACE_ROOT)ace/Message_Queue.h \ - $(ACE_ROOT)ace/Message_Block.h \ - $(ACE_ROOT)ace/Message_Block.i \ - $(ACE_ROOT)ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)ace/Message_Queue.i \ - $(ACE_ROOT)ace/Message_Queue.cpp \ - $(ACE_ROOT)ace/WFMO_Reactor.i \ - $(ACE_ROOT)ace/Strategies.i \ - $(ACE_ROOT)ace/Connector.h \ - $(ACE_ROOT)ace/Map_Manager.h \ - $(ACE_ROOT)ace/Map_Manager.i \ - $(ACE_ROOT)ace/Map_Manager.cpp \ - $(ACE_ROOT)ace/Svc_Handler.h \ - $(ACE_ROOT)ace/Task.h \ - $(ACE_ROOT)ace/Task.i \ - $(ACE_ROOT)ace/Task_T.h \ - $(ACE_ROOT)ace/Task_T.i \ - $(ACE_ROOT)ace/Task_T.cpp \ - $(ACE_ROOT)ace/Module.h \ - $(ACE_ROOT)ace/Module.i \ - $(ACE_ROOT)ace/Module.cpp \ - $(ACE_ROOT)ace/Stream_Modules.h \ - $(ACE_ROOT)ace/Stream_Modules.i \ - $(ACE_ROOT)ace/Stream_Modules.cpp \ - $(ACE_ROOT)ace/Dynamic.h \ - $(ACE_ROOT)ace/Dynamic.i \ - $(ACE_ROOT)ace/Singleton.h \ - $(ACE_ROOT)ace/Singleton.i \ - $(ACE_ROOT)ace/Singleton.cpp \ - $(ACE_ROOT)ace/Svc_Handler.i \ - $(ACE_ROOT)ace/Svc_Handler.cpp \ - $(ACE_ROOT)ace/Connector.i \ - $(ACE_ROOT)ace/Connector.cpp \ - $(ACE_ROOT)ace/Acceptor.h \ - $(ACE_ROOT)ace/Acceptor.i \ - $(ACE_ROOT)ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -219,22 +219,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -264,14 +254,25 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)ace/Dynamic_Service.h \ - $(ACE_ROOT)ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -279,14 +280,16 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(ACE_ROOT)ace/SOCK_Dgram.h \ - $(ACE_ROOT)ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ @@ -303,8 +306,8 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(ACE_ROOT)ace/Process.h \ - $(ACE_ROOT)ace/Process.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ @@ -313,163 +316,163 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(ACE_ROOT)ace/High_Res_Timer.h \ - $(ACE_ROOT)ace/High_Res_Timer.i + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ - $(ACE_ROOT)ace/Get_Opt.h \ - $(ACE_ROOT)ace/ACE.h \ - $(ACE_ROOT)ace/OS.h \ - $(ACE_ROOT)ace/inc_user_config.h \ - $(ACE_ROOT)ace/config.h \ - $(ACE_ROOT)ace/config-sunos5.5.h \ - $(ACE_ROOT)ace/config-g++-common.h \ - $(ACE_ROOT)ace/streams.h \ - $(ACE_ROOT)ace/Basic_Types.h \ - $(ACE_ROOT)ace/Basic_Types.i \ - $(ACE_ROOT)ace/OS.i \ - $(ACE_ROOT)ace/Trace.h \ - $(ACE_ROOT)ace/Log_Msg.h \ - $(ACE_ROOT)ace/Log_Record.h \ - $(ACE_ROOT)ace/ACE.i \ - $(ACE_ROOT)ace/Log_Priority.h \ - $(ACE_ROOT)ace/Log_Record.i \ - $(ACE_ROOT)ace/Get_Opt.i \ - $(ACE_ROOT)ace/Acceptor.h \ - $(ACE_ROOT)ace/Service_Config.h \ - $(ACE_ROOT)ace/Service_Object.h \ - $(ACE_ROOT)ace/Shared_Object.h \ - $(ACE_ROOT)ace/Shared_Object.i \ - $(ACE_ROOT)ace/Event_Handler.h \ - $(ACE_ROOT)ace/Event_Handler.i \ - $(ACE_ROOT)ace/Service_Object.i \ - $(ACE_ROOT)ace/Signal.h \ - $(ACE_ROOT)ace/Synch.h \ - $(ACE_ROOT)ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)ace/Synch.i \ - $(ACE_ROOT)ace/Synch_T.h \ - $(ACE_ROOT)ace/Synch_T.i \ - $(ACE_ROOT)ace/Thread.h \ - $(ACE_ROOT)ace/Thread.i \ - $(ACE_ROOT)ace/Atomic_Op.i \ - $(ACE_ROOT)ace/Synch_T.cpp \ - $(ACE_ROOT)ace/Containers.h \ - $(ACE_ROOT)ace/Containers.i \ - $(ACE_ROOT)ace/Containers.cpp \ - $(ACE_ROOT)ace/Malloc.h \ - $(ACE_ROOT)ace/Malloc_Base.h \ - $(ACE_ROOT)ace/Malloc.i \ - $(ACE_ROOT)ace/Malloc_T.h \ - $(ACE_ROOT)ace/Free_List.h \ - $(ACE_ROOT)ace/Free_List.i \ - $(ACE_ROOT)ace/Free_List.cpp \ - $(ACE_ROOT)ace/Malloc_T.i \ - $(ACE_ROOT)ace/Malloc_T.cpp \ - $(ACE_ROOT)ace/Memory_Pool.h \ - $(ACE_ROOT)ace/Mem_Map.h \ - $(ACE_ROOT)ace/Mem_Map.i \ - $(ACE_ROOT)ace/Memory_Pool.i \ - $(ACE_ROOT)ace/Signal.i \ - $(ACE_ROOT)ace/Object_Manager.h \ - $(ACE_ROOT)ace/Object_Manager.i \ - $(ACE_ROOT)ace/Managed_Object.h \ - $(ACE_ROOT)ace/Managed_Object.i \ - $(ACE_ROOT)ace/Managed_Object.cpp \ - $(ACE_ROOT)ace/SString.h \ - $(ACE_ROOT)ace/SString.i \ - $(ACE_ROOT)ace/Service_Config.i \ - $(ACE_ROOT)ace/Reactor.h \ - $(ACE_ROOT)ace/Handle_Set.h \ - $(ACE_ROOT)ace/Handle_Set.i \ - $(ACE_ROOT)ace/Timer_Queue.h \ - $(ACE_ROOT)ace/Timer_Queue_T.h \ - $(ACE_ROOT)ace/Timer_Queue_T.i \ - $(ACE_ROOT)ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)ace/Reactor.i \ - $(ACE_ROOT)ace/Reactor_Impl.h \ - $(ACE_ROOT)ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)ace/Svc_Handler.h \ - $(ACE_ROOT)ace/Synch_Options.h \ - $(ACE_ROOT)ace/Synch_Options.i \ - $(ACE_ROOT)ace/Task.h \ - $(ACE_ROOT)ace/Thread_Manager.h \ - $(ACE_ROOT)ace/Thread_Manager.i \ - $(ACE_ROOT)ace/Task.i \ - $(ACE_ROOT)ace/Task_T.h \ - $(ACE_ROOT)ace/Message_Queue.h \ - $(ACE_ROOT)ace/Message_Block.h \ - $(ACE_ROOT)ace/Message_Block.i \ - $(ACE_ROOT)ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)ace/Strategies.h \ - $(ACE_ROOT)ace/Strategies_T.h \ - $(ACE_ROOT)ace/Hash_Map_Manager.h \ - $(ACE_ROOT)ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)ace/Strategies_T.i \ - $(ACE_ROOT)ace/Strategies_T.cpp \ - $(ACE_ROOT)ace/Service_Repository.h \ - $(ACE_ROOT)ace/Service_Types.h \ - $(ACE_ROOT)ace/Service_Types.i \ - $(ACE_ROOT)ace/Service_Repository.i \ - $(ACE_ROOT)ace/WFMO_Reactor.h \ - $(ACE_ROOT)ace/WFMO_Reactor.i \ - $(ACE_ROOT)ace/Strategies.i \ - $(ACE_ROOT)ace/Message_Queue.i \ - $(ACE_ROOT)ace/Message_Queue.cpp \ - $(ACE_ROOT)ace/Task_T.i \ - $(ACE_ROOT)ace/Task_T.cpp \ - $(ACE_ROOT)ace/Module.h \ - $(ACE_ROOT)ace/Module.i \ - $(ACE_ROOT)ace/Module.cpp \ - $(ACE_ROOT)ace/Stream_Modules.h \ - $(ACE_ROOT)ace/Stream_Modules.i \ - $(ACE_ROOT)ace/Stream_Modules.cpp \ - $(ACE_ROOT)ace/Dynamic.h \ - $(ACE_ROOT)ace/Dynamic.i \ - $(ACE_ROOT)ace/Singleton.h \ - $(ACE_ROOT)ace/Singleton.i \ - $(ACE_ROOT)ace/Singleton.cpp \ - $(ACE_ROOT)ace/Svc_Handler.i \ - $(ACE_ROOT)ace/Svc_Handler.cpp \ - $(ACE_ROOT)ace/Acceptor.i \ - $(ACE_ROOT)ace/Acceptor.cpp \ - $(ACE_ROOT)ace/SOCK_Acceptor.h \ - $(ACE_ROOT)ace/SOCK_Stream.h \ - $(ACE_ROOT)ace/SOCK_IO.h \ - $(ACE_ROOT)ace/SOCK.h \ - $(ACE_ROOT)ace/Addr.h \ - $(ACE_ROOT)ace/Addr.i \ - $(ACE_ROOT)ace/IPC_SAP.h \ - $(ACE_ROOT)ace/IPC_SAP.i \ - $(ACE_ROOT)ace/SOCK.i \ - $(ACE_ROOT)ace/SOCK_IO.i \ - $(ACE_ROOT)ace/INET_Addr.h \ - $(ACE_ROOT)ace/INET_Addr.i \ - $(ACE_ROOT)ace/SOCK_Stream.i \ - $(ACE_ROOT)ace/Time_Value.h \ - $(ACE_ROOT)ace/SOCK_Acceptor.i \ - $(ACE_ROOT)ace/SOCK_CODgram.h \ - $(ACE_ROOT)ace/SOCK_CODgram.i \ - $(ACE_ROOT)ace/Select_Reactor.h \ - $(ACE_ROOT)ace/Token.h \ - $(ACE_ROOT)ace/Token.i \ - $(ACE_ROOT)ace/Pipe.h \ - $(ACE_ROOT)ace/Pipe.i \ - $(ACE_ROOT)ace/Select_Reactor.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Select_Reactor.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)ace/SOCK_Connector.h \ - $(ACE_ROOT)ace/SOCK_Connector.i \ - $(ACE_ROOT)ace/Connector.h \ - $(ACE_ROOT)ace/Map_Manager.h \ - $(ACE_ROOT)ace/Map_Manager.i \ - $(ACE_ROOT)ace/Map_Manager.cpp \ - $(ACE_ROOT)ace/Connector.i \ - $(ACE_ROOT)ace/Connector.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -479,22 +482,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -524,14 +517,25 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)ace/Dynamic_Service.h \ - $(ACE_ROOT)ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -539,6 +543,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -546,10 +552,10 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(ACE_ROOT)ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)ace/SOCK_Dgram.h \ - $(ACE_ROOT)ace/SOCK_Dgram.i \ - $(ACE_ROOT)ace/SOCK_Dgram_Mcast.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ @@ -573,8 +579,8 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(ACE_ROOT)ace/Process.h \ - $(ACE_ROOT)ace/Process.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ @@ -584,165 +590,166 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - client.h $(ACE_ROOT)ace/ARGV.h \ - $(ACE_ROOT)ace/ARGV.i \ - $(ACE_ROOT)ace/High_Res_Timer.h \ - $(ACE_ROOT)ace/High_Res_Timer.i child.h + client.h $(ACE_ROOT)/ace/ARGV.h \ + $(ACE_ROOT)/ace/ARGV.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ + child.h .obj/child.o .obj/child.so .shobj/child.o .shobj/child.so: child.cpp child.h \ - $(ACE_ROOT)ace/Get_Opt.h \ - $(ACE_ROOT)ace/ACE.h \ - $(ACE_ROOT)ace/OS.h \ - $(ACE_ROOT)ace/inc_user_config.h \ - $(ACE_ROOT)ace/config.h \ - $(ACE_ROOT)ace/config-sunos5.5.h \ - $(ACE_ROOT)ace/config-g++-common.h \ - $(ACE_ROOT)ace/streams.h \ - $(ACE_ROOT)ace/Basic_Types.h \ - $(ACE_ROOT)ace/Basic_Types.i \ - $(ACE_ROOT)ace/OS.i \ - $(ACE_ROOT)ace/Trace.h \ - $(ACE_ROOT)ace/Log_Msg.h \ - $(ACE_ROOT)ace/Log_Record.h \ - $(ACE_ROOT)ace/ACE.i \ - $(ACE_ROOT)ace/Log_Priority.h \ - $(ACE_ROOT)ace/Log_Record.i \ - $(ACE_ROOT)ace/Get_Opt.i \ - $(ACE_ROOT)ace/Acceptor.h \ - $(ACE_ROOT)ace/Service_Config.h \ - $(ACE_ROOT)ace/Service_Object.h \ - $(ACE_ROOT)ace/Shared_Object.h \ - $(ACE_ROOT)ace/Shared_Object.i \ - $(ACE_ROOT)ace/Event_Handler.h \ - $(ACE_ROOT)ace/Event_Handler.i \ - $(ACE_ROOT)ace/Service_Object.i \ - $(ACE_ROOT)ace/Signal.h \ - $(ACE_ROOT)ace/Synch.h \ - $(ACE_ROOT)ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)ace/Synch.i \ - $(ACE_ROOT)ace/Synch_T.h \ - $(ACE_ROOT)ace/Synch_T.i \ - $(ACE_ROOT)ace/Thread.h \ - $(ACE_ROOT)ace/Thread.i \ - $(ACE_ROOT)ace/Atomic_Op.i \ - $(ACE_ROOT)ace/Synch_T.cpp \ - $(ACE_ROOT)ace/Containers.h \ - $(ACE_ROOT)ace/Containers.i \ - $(ACE_ROOT)ace/Containers.cpp \ - $(ACE_ROOT)ace/Malloc.h \ - $(ACE_ROOT)ace/Malloc_Base.h \ - $(ACE_ROOT)ace/Malloc.i \ - $(ACE_ROOT)ace/Malloc_T.h \ - $(ACE_ROOT)ace/Free_List.h \ - $(ACE_ROOT)ace/Free_List.i \ - $(ACE_ROOT)ace/Free_List.cpp \ - $(ACE_ROOT)ace/Malloc_T.i \ - $(ACE_ROOT)ace/Malloc_T.cpp \ - $(ACE_ROOT)ace/Memory_Pool.h \ - $(ACE_ROOT)ace/Mem_Map.h \ - $(ACE_ROOT)ace/Mem_Map.i \ - $(ACE_ROOT)ace/Memory_Pool.i \ - $(ACE_ROOT)ace/Signal.i \ - $(ACE_ROOT)ace/Object_Manager.h \ - $(ACE_ROOT)ace/Object_Manager.i \ - $(ACE_ROOT)ace/Managed_Object.h \ - $(ACE_ROOT)ace/Managed_Object.i \ - $(ACE_ROOT)ace/Managed_Object.cpp \ - $(ACE_ROOT)ace/SString.h \ - $(ACE_ROOT)ace/SString.i \ - $(ACE_ROOT)ace/Service_Config.i \ - $(ACE_ROOT)ace/Reactor.h \ - $(ACE_ROOT)ace/Handle_Set.h \ - $(ACE_ROOT)ace/Handle_Set.i \ - $(ACE_ROOT)ace/Timer_Queue.h \ - $(ACE_ROOT)ace/Timer_Queue_T.h \ - $(ACE_ROOT)ace/Timer_Queue_T.i \ - $(ACE_ROOT)ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)ace/Reactor.i \ - $(ACE_ROOT)ace/Reactor_Impl.h \ - $(ACE_ROOT)ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)ace/Svc_Handler.h \ - $(ACE_ROOT)ace/Synch_Options.h \ - $(ACE_ROOT)ace/Synch_Options.i \ - $(ACE_ROOT)ace/Task.h \ - $(ACE_ROOT)ace/Thread_Manager.h \ - $(ACE_ROOT)ace/Thread_Manager.i \ - $(ACE_ROOT)ace/Task.i \ - $(ACE_ROOT)ace/Task_T.h \ - $(ACE_ROOT)ace/Message_Queue.h \ - $(ACE_ROOT)ace/Message_Block.h \ - $(ACE_ROOT)ace/Message_Block.i \ - $(ACE_ROOT)ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)ace/Strategies.h \ - $(ACE_ROOT)ace/Strategies_T.h \ - $(ACE_ROOT)ace/Hash_Map_Manager.h \ - $(ACE_ROOT)ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)ace/Strategies_T.i \ - $(ACE_ROOT)ace/Strategies_T.cpp \ - $(ACE_ROOT)ace/Service_Repository.h \ - $(ACE_ROOT)ace/Service_Types.h \ - $(ACE_ROOT)ace/Service_Types.i \ - $(ACE_ROOT)ace/Service_Repository.i \ - $(ACE_ROOT)ace/WFMO_Reactor.h \ - $(ACE_ROOT)ace/WFMO_Reactor.i \ - $(ACE_ROOT)ace/Strategies.i \ - $(ACE_ROOT)ace/Message_Queue.i \ - $(ACE_ROOT)ace/Message_Queue.cpp \ - $(ACE_ROOT)ace/Task_T.i \ - $(ACE_ROOT)ace/Task_T.cpp \ - $(ACE_ROOT)ace/Module.h \ - $(ACE_ROOT)ace/Module.i \ - $(ACE_ROOT)ace/Module.cpp \ - $(ACE_ROOT)ace/Stream_Modules.h \ - $(ACE_ROOT)ace/Stream_Modules.i \ - $(ACE_ROOT)ace/Stream_Modules.cpp \ - $(ACE_ROOT)ace/Dynamic.h \ - $(ACE_ROOT)ace/Dynamic.i \ - $(ACE_ROOT)ace/Singleton.h \ - $(ACE_ROOT)ace/Singleton.i \ - $(ACE_ROOT)ace/Singleton.cpp \ - $(ACE_ROOT)ace/Svc_Handler.i \ - $(ACE_ROOT)ace/Svc_Handler.cpp \ - $(ACE_ROOT)ace/Acceptor.i \ - $(ACE_ROOT)ace/Acceptor.cpp \ - $(ACE_ROOT)ace/SOCK_Acceptor.h \ - $(ACE_ROOT)ace/SOCK_Stream.h \ - $(ACE_ROOT)ace/SOCK_IO.h \ - $(ACE_ROOT)ace/SOCK.h \ - $(ACE_ROOT)ace/Addr.h \ - $(ACE_ROOT)ace/Addr.i \ - $(ACE_ROOT)ace/IPC_SAP.h \ - $(ACE_ROOT)ace/IPC_SAP.i \ - $(ACE_ROOT)ace/SOCK.i \ - $(ACE_ROOT)ace/SOCK_IO.i \ - $(ACE_ROOT)ace/INET_Addr.h \ - $(ACE_ROOT)ace/INET_Addr.i \ - $(ACE_ROOT)ace/SOCK_Stream.i \ - $(ACE_ROOT)ace/Time_Value.h \ - $(ACE_ROOT)ace/SOCK_Acceptor.i \ - $(ACE_ROOT)ace/SOCK_CODgram.h \ - $(ACE_ROOT)ace/SOCK_CODgram.i \ - $(ACE_ROOT)ace/Select_Reactor.h \ - $(ACE_ROOT)ace/Token.h \ - $(ACE_ROOT)ace/Token.i \ - $(ACE_ROOT)ace/Pipe.h \ - $(ACE_ROOT)ace/Pipe.i \ - $(ACE_ROOT)ace/Select_Reactor.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ + $(ACE_ROOT)/ace/SOCK_CODgram.i \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Token.h \ + $(ACE_ROOT)/ace/Token.i \ + $(ACE_ROOT)/ace/Pipe.h \ + $(ACE_ROOT)/ace/Pipe.i \ + $(ACE_ROOT)/ace/Select_Reactor.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)ace/SOCK_Connector.h \ - $(ACE_ROOT)ace/SOCK_Connector.i \ - $(ACE_ROOT)ace/Connector.h \ - $(ACE_ROOT)ace/Map_Manager.h \ - $(ACE_ROOT)ace/Map_Manager.i \ - $(ACE_ROOT)ace/Map_Manager.cpp \ - $(ACE_ROOT)ace/Connector.i \ - $(ACE_ROOT)ace/Connector.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -752,22 +759,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -797,14 +794,25 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)ace/Dynamic_Service.h \ - $(ACE_ROOT)ace/Dynamic_Service.cpp \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -812,6 +820,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -819,10 +829,10 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(ACE_ROOT)ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)ace/SOCK_Dgram.h \ - $(ACE_ROOT)ace/SOCK_Dgram.i \ - $(ACE_ROOT)ace/SOCK_Dgram_Mcast.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ @@ -846,8 +856,8 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(ACE_ROOT)ace/Process.h \ - $(ACE_ROOT)ace/Process.i \ + $(ACE_ROOT)/ace/Process.h \ + $(ACE_ROOT)/ace/Process.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ @@ -857,9 +867,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - client.h $(ACE_ROOT)ace/ARGV.h \ - $(ACE_ROOT)ace/ARGV.i \ - $(ACE_ROOT)ace/High_Res_Timer.h \ - $(ACE_ROOT)ace/High_Res_Timer.i + client.h $(ACE_ROOT)/ace/ARGV.h \ + $(ACE_ROOT)/ace/ARGV.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile index e650595e4e6..87bb8105ba2 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile @@ -24,7 +24,6 @@ DIRS = mpeg_shared \ 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.nested.GNU include $(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile index b60d8f8b1c8..95436fd25e1 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile @@ -21,6 +21,11 @@ LIBS += -lTAO -lACE -lorbsvcs MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source CPPFLAGS += -I$(MPEG_ROOT) +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + + #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -55,6 +60,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile index 539212e555f..47970f6417a 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile @@ -9,6 +9,10 @@ LIBNAME = libmpeg_client LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + # On non-Windows environment, we should at least define # the export_include IDL flag. FILES= 24bit \ @@ -99,7 +103,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i newproto.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ global.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \ @@ -122,7 +127,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i newproto.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ global.h .obj/decoders.o .obj/decoders.so .shobj/decoders.o .shobj/decoders.so: decoders.cpp decoders.h util.h video.h proto.h @@ -143,7 +149,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i newproto.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ global.h .obj/fs2.o .obj/fs2.so .shobj/fs2.o .shobj/fs2.so: fs2.cpp video.h dither.h fs2.h proto.h @@ -194,7 +201,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i newproto.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ global.h .obj/parseblock.o .obj/parseblock.so .shobj/parseblock.o .shobj/parseblock.so: parseblock.cpp video.h proto.h decoders.h util.h \ @@ -231,7 +239,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i newproto.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ global.h .obj/ui.o .obj/ui.so .shobj/ui.o .shobj/ui.so: ui.cpp \ @@ -251,10 +260,10 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i interface/fb.xbm \ - interface/play.xbm interface/step.xbm interface/stop.xbm \ - interface/loop.xbm interface/ff.xbm interface/MainWindow.mib \ - interface/Info.mib video.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + interface/fb.xbm interface/play.xbm interface/step.xbm \ + interface/stop.xbm interface/loop.xbm interface/ff.xbm \ + interface/MainWindow.mib interface/Info.mib video.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ @@ -278,7 +287,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i newproto.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ global.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \ @@ -301,7 +311,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i newproto.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ global.h dither.h video.h proto.h .obj/video.o .obj/video.so .shobj/video.o .shobj/video.so: video.cpp \ @@ -321,8 +332,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i decoders.h util.h \ - video.h proto.h global.h ui.h + $(ACE_ROOT)/ace/Log_Record.i \ + decoders.h util.h video.h proto.h global.h ui.h .obj/vp.o .obj/vp.so .shobj/vp.o .shobj/vp.so: vp.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(ACE_ROOT)/ace/OS.h \ @@ -340,7 +351,8 @@ realclean: clean $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i newproto.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + newproto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ global.h dither.h video.h proto.h ui.h .obj/Command_Handler.o .obj/Command_Handler.so .shobj/Command_Handler.o .shobj/Command_Handler.so: Command_Handler.cpp Command_Handler.h \ @@ -458,8 +470,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -490,8 +504,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -501,22 +513,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -546,6 +548,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -554,6 +558,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -561,6 +574,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -599,6 +614,8 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ + $(ACE_ROOT)/ace/High_Res_Timer.h \ + $(ACE_ROOT)/ace/High_Res_Timer.i \ ctr.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ newproto.h \ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile index 2465314ea49..70206b0d54e 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile @@ -9,6 +9,10 @@ LIBNAME = libmpeg_mib LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + # On non-Windows environment, we should at least define # the export_include IDL flag. FILES= mibButton \ @@ -63,6 +67,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -79,6 +85,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -95,6 +103,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -111,6 +121,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -127,6 +139,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -143,6 +157,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -159,6 +175,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -175,6 +193,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -191,6 +211,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -207,6 +229,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -223,6 +247,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -239,6 +265,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -255,6 +283,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile index 36154710dad..b659141149b 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile @@ -9,6 +9,10 @@ LIBNAME = libmpeg_server LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + # On non-Windows environment, we should at least define # the export_include IDL flag. FILES= as las lvs vs Globals Video_Server Video_Control_State Video_Control_i Audio_Server Audio_Control_State Audio_Control_i @@ -40,7 +44,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #LDFLAGS += -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl LDFLAGS += -lsocket -lnsl -ldl -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) CPPFLAGS += -DSH_MEM -I/project/doc/pkg/X11/include clean: @@ -57,6 +61,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -96,7 +102,14 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \ @@ -108,19 +121,29 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -128,8 +151,16 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -137,69 +168,67 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -209,8 +238,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -219,22 +246,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -242,10 +284,17 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -254,10 +303,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -268,16 +323,24 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i .obj/las.o .obj/las.so .shobj/las.o .shobj/las.so: las.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -314,7 +377,14 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \ @@ -329,19 +399,29 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -349,8 +429,16 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -358,69 +446,67 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -430,8 +516,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -440,22 +524,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -463,10 +562,17 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -475,10 +581,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -489,16 +601,24 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i .obj/lvs.o .obj/lvs.so .shobj/lvs.o .shobj/lvs.so: lvs.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -536,7 +656,14 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \ @@ -550,19 +677,29 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -570,8 +707,16 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -579,69 +724,67 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -651,8 +794,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -661,22 +802,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -684,10 +840,17 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -696,10 +859,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -710,16 +879,24 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i .obj/vs.o .obj/vs.so .shobj/vs.o .shobj/vs.so: vs.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -760,7 +937,14 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \ @@ -771,19 +955,29 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -791,8 +985,16 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -800,69 +1002,67 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -872,8 +1072,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -882,22 +1080,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -905,10 +1118,17 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -917,10 +1137,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -931,10 +1157,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i .obj/Globals.o .obj/Globals.so .shobj/Globals.o .shobj/Globals.so: Globals.cpp Globals.h \ $(ACE_ROOT)/ace/SOCK_CODgram.h \ @@ -944,6 +1176,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -975,7 +1209,14 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \ @@ -991,19 +1232,29 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -1011,8 +1262,16 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -1020,69 +1279,67 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1092,8 +1349,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1102,22 +1357,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1125,10 +1395,17 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -1137,10 +1414,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -1151,10 +1434,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i .obj/Video_Server.o .obj/Video_Server.so .shobj/Video_Server.o .shobj/Video_Server.so: Video_Server.cpp Video_Server.h \ $(ACE_ROOT)/ace/Reactor.h \ @@ -1163,6 +1452,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1188,22 +1479,38 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -1219,8 +1526,16 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -1228,71 +1543,70 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1302,8 +1616,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1312,22 +1624,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1335,6 +1662,10 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \ @@ -1344,6 +1675,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \ @@ -1353,6 +1687,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -1361,10 +1698,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -1375,6 +1718,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i .obj/Video_Control_State.o .obj/Video_Control_State.so .shobj/Video_Control_State.o .shobj/Video_Control_State.so: Video_Control_State.cpp Video_Control_State.h \ $(ACE_ROOT)/ace/Singleton.h \ @@ -1383,6 +1729,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1405,10 +1753,18 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -1424,15 +1780,7 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -1441,79 +1789,102 @@ realclean: clean $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1523,8 +1894,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1533,22 +1902,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1556,8 +1940,15 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \ @@ -1574,6 +1965,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ @@ -1581,10 +1975,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -1595,15 +1995,21 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ Video_Server.h .obj/Video_Control_i.o .obj/Video_Control_i.so .shobj/Video_Control_i.o .shobj/Video_Control_i.so: Video_Control_i.cpp Video_Control_i.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1642,16 +2048,9 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -1660,81 +2059,110 @@ realclean: clean $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1744,8 +2172,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1754,22 +2180,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1777,10 +2218,18 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ - Video_Server.h $(TAO_ROOT)/tao/TAO.h \ + Video_Server.h \ + $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \ @@ -1794,6 +2243,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -1802,10 +2254,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -1816,12 +2274,17 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i .obj/Audio_Server.o .obj/Audio_Server.so .shobj/Audio_Server.o .shobj/Audio_Server.so: Audio_Server.cpp Audio_Server.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -1861,7 +2324,14 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \ @@ -1873,19 +2343,29 @@ realclean: clean $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(TAO_ROOT)/tao/TAO.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -1893,8 +2373,16 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.h \ $(ACE_ROOT)/ace/Time_Value.h \ $(ACE_ROOT)/ace/SOCK_Acceptor.i \ @@ -1902,69 +2390,67 @@ realclean: clean $(ACE_ROOT)/ace/SOCK_Connector.i \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1974,8 +2460,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -1984,22 +2468,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -2007,10 +2506,17 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -2019,10 +2525,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -2033,10 +2545,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \ Audio_Control_i.h Audio_Control_State.h .obj/Audio_Control_State.o .obj/Audio_Control_State.so .shobj/Audio_Control_State.o .shobj/Audio_Control_State.so: Audio_Control_State.cpp Audio_Control_State.h \ @@ -2046,6 +2564,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -2068,10 +2588,18 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -2087,15 +2615,7 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -2104,79 +2624,102 @@ realclean: clean $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -2186,8 +2729,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -2196,22 +2737,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -2219,10 +2775,18 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \ - Globals.h $(ACE_ROOT)/ace/SOCK_CODgram.h \ + Globals.h \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ @@ -2236,6 +2800,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -2244,10 +2811,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -2258,6 +2831,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ Audio_Control_i.h Audio_Server.h server_proto.h .obj/Audio_Control_i.o .obj/Audio_Control_i.so .shobj/Audio_Control_i.o .shobj/Audio_Control_i.so: Audio_Control_i.cpp Audio_Control_State.h \ @@ -2267,6 +2843,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -2289,10 +2867,18 @@ realclean: clean $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -2308,15 +2894,7 @@ realclean: clean $(ACE_ROOT)/ace/INET_Addr.i \ $(ACE_ROOT)/ace/SOCK_Stream.i \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ $(ACE_ROOT)/ace/Service_Config.h \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ @@ -2325,79 +2903,102 @@ realclean: clean $(ACE_ROOT)/ace/Signal.h \ $(ACE_ROOT)/ace/Containers.h \ $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ $(ACE_ROOT)/ace/Handle_Set.i \ $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ $(ACE_ROOT)/ace/Thread_Manager.h \ $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -2407,8 +3008,6 @@ realclean: clean $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ @@ -2417,22 +3016,37 @@ realclean: clean $(TAO_ROOT)/tao/CDR.i \ $(TAO_ROOT)/tao/PolicyC.h \ $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/PolicyS.h \ - $(TAO_ROOT)/tao/PolicyS.i \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -2440,10 +3054,18 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \ - Globals.h $(ACE_ROOT)/ace/SOCK_CODgram.h \ + Globals.h \ + $(ACE_ROOT)/ace/SOCK_CODgram.h \ $(ACE_ROOT)/ace/SOCK_CODgram.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ @@ -2457,6 +3079,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ + $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ @@ -2465,10 +3090,16 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ $(ACE_ROOT)/ace/Process.h \ @@ -2479,6 +3110,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ Audio_Control_i.h Audio_Server.h server_proto.h diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile index a81824a1d7b..181c94427e2 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile @@ -9,6 +9,10 @@ LIBNAME = libmpeg_shared LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + # On non-Windows environment, we should at least define # the export_include IDL flag. FILES = $(IDL_FILES) @@ -24,7 +28,7 @@ IDL_FILES = Video_ControlS Video_ControlC Audio_ControlS Audio_ControlC FILES += com fileio filters routine sendpt LDFLAGS += -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source CPPFLAGS += -I$(MPEG_ROOT) @@ -49,7 +53,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- ##LDFLAGS += -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) CPPFLAGS += -DSH_MEM -DNDEBUG .PRECIOUS: Video_ControlS.cpp Video_ControlC.cpp Audio_ControlS.cpp Audio_ControlC.cpp @@ -65,11 +69,905 @@ realclean: clean # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. +.obj/Video_ControlS.o .obj/Video_ControlS.so .shobj/Video_ControlS.o .shobj/Video_ControlS.so: Video_ControlS.cpp Video_ControlS.h Video_ControlC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h \ + Video_ControlC.i Video_ControlS_T.h Video_ControlS_T.i \ + Video_ControlS_T.cpp Video_ControlS.i +.obj/Video_ControlC.o .obj/Video_ControlC.so .shobj/Video_ControlC.o .shobj/Video_ControlC.so: Video_ControlC.cpp Video_ControlC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h \ + Video_ControlC.i Video_ControlS.h Video_ControlS_T.h \ + Video_ControlS_T.i Video_ControlS_T.cpp Video_ControlS.i +.obj/Audio_ControlS.o .obj/Audio_ControlS.so .shobj/Audio_ControlS.o .shobj/Audio_ControlS.so: Audio_ControlS.cpp Audio_ControlS.h Audio_ControlC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h \ + Audio_ControlC.i Audio_ControlS_T.h Audio_ControlS_T.i \ + Audio_ControlS_T.cpp Audio_ControlS.i +.obj/Audio_ControlC.o .obj/Audio_ControlC.so .shobj/Audio_ControlC.o .shobj/Audio_ControlC.so: Audio_ControlC.cpp Audio_ControlC.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h \ + Audio_ControlC.i Audio_ControlS.h Audio_ControlS_T.h \ + Audio_ControlS_T.i Audio_ControlS_T.cpp Audio_ControlS.i .obj/com.o .obj/com.so .shobj/com.o .shobj/com.so: com.cpp \ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -87,6 +985,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -102,6 +1002,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -118,6 +1020,8 @@ realclean: clean $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile index fb3886d2c30..e01aef413ef 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile @@ -9,6 +9,10 @@ BIN = augmented_server server vs as BUILD = $(BIN) +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + AV_SERVER_OBJS = server.o AV_AUGSERVER_OBJS = Video_RepositoryC.o augmented_server.o \ Property_Exporter.o Machine_Properties.o \ @@ -49,7 +53,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #---------------------------------------------------------------------------- CPPFLAGS += -DSH_MEM -DNDEBUG -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) .PRECIOUS: Video_RepositoryC.cpp @@ -82,7 +86,7 @@ realclean: clean # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -.obj/augmented_server.o .obj/augmented_server.so .shobj/augmented_server.o .shobj/augmented_server.so: augmented_server.cpp augmented_server.h \ +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -169,6 +173,9 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ @@ -183,7 +190,6 @@ realclean: clean $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/Task_T.i \ $(ACE_ROOT)/ace/Task_T.cpp \ $(ACE_ROOT)/ace/Module.h \ @@ -243,8 +249,6 @@ realclean: clean $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Connector.i \ $(ACE_ROOT)/ace/Connector.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -254,22 +258,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -299,6 +293,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -307,267 +303,6 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ - $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/Process.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.h \ - $(ACE_ROOT)/ace/SOCK_Dgram.i \ - $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h \ - vs.h Property_Exporter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Dynamic_Property.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Attributes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - Machine_Properties.h Video_Repository.h Video_RepositoryC.h \ - Video_RepositoryC.i -.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_CODgram.h \ - $(ACE_ROOT)/ace/SOCK_CODgram.i \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \ - $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \ - $(TAO_ROOT)/tao/TAO.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ $(TAO_ROOT)/tao/default_client.h \ @@ -577,43 +312,6 @@ realclean: clean $(TAO_ROOT)/tao/ORB_Strategies_T.i \ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Object_Table.h \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -621,6 +319,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -798,8 +498,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -830,8 +532,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -841,22 +541,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -886,6 +576,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -894,6 +586,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -901,6 +602,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -1104,8 +807,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -1133,8 +838,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1144,22 +847,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1189,6 +882,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1197,6 +892,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1204,6 +908,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -1272,469 +978,5 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h -.obj/Property_Exporter.o .obj/Property_Exporter.so .shobj/Property_Exporter.o .shobj/Property_Exporter.so: Property_Exporter.cpp Property_Exporter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Object_Table.h \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Dynamic_Property.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Attributes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Property_Evaluator.h -.obj/Machine_Properties.o .obj/Machine_Properties.so .shobj/Machine_Properties.o .shobj/Machine_Properties.so: Machine_Properties.cpp Machine_Properties.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Dynamic_Property.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Event_Handler.h \ - $(ACE_ROOT)/ace/Event_Handler.i \ - $(ACE_ROOT)/ace/Service_Object.i \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Synch.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ - $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ - $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ - $(ACE_ROOT)/ace/Synch.i \ - $(ACE_ROOT)/ace/Synch_T.h \ - $(ACE_ROOT)/ace/Synch_T.i \ - $(ACE_ROOT)/ace/Thread.h \ - $(ACE_ROOT)/ace/Thread.i \ - $(ACE_ROOT)/ace/Atomic_Op.i \ - $(ACE_ROOT)/ace/Synch_T.cpp \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ - $(ACE_ROOT)/ace/Containers.cpp \ - $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Malloc.i \ - $(ACE_ROOT)/ace/Malloc_T.h \ - $(ACE_ROOT)/ace/Free_List.h \ - $(ACE_ROOT)/ace/Free_List.i \ - $(ACE_ROOT)/ace/Free_List.cpp \ - $(ACE_ROOT)/ace/Malloc_T.i \ - $(ACE_ROOT)/ace/Malloc_T.cpp \ - $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/Signal.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Service_Config.i \ - $(ACE_ROOT)/ace/Reactor.h \ - $(ACE_ROOT)/ace/Handle_Set.h \ - $(ACE_ROOT)/ace/Handle_Set.i \ - $(ACE_ROOT)/ace/Timer_Queue.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.h \ - $(ACE_ROOT)/ace/Timer_Queue_T.i \ - $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ - $(ACE_ROOT)/ace/Reactor.i \ - $(ACE_ROOT)/ace/Reactor_Impl.h \ - $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Attributes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ - $(TAO_ROOT)/tao/corba.h \ - $(TAO_ROOT)/tao/orbconf.h \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/SOCK_Stream.h \ - $(ACE_ROOT)/ace/SOCK_IO.h \ - $(ACE_ROOT)/ace/SOCK.h \ - $(ACE_ROOT)/ace/Addr.h \ - $(ACE_ROOT)/ace/Addr.i \ - $(ACE_ROOT)/ace/IPC_SAP.h \ - $(ACE_ROOT)/ace/IPC_SAP.i \ - $(ACE_ROOT)/ace/SOCK.i \ - $(ACE_ROOT)/ace/SOCK_IO.i \ - $(ACE_ROOT)/ace/INET_Addr.h \ - $(ACE_ROOT)/ace/INET_Addr.i \ - $(ACE_ROOT)/ace/SOCK_Stream.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Synch_Options.h \ - $(ACE_ROOT)/ace/Synch_Options.i \ - $(ACE_ROOT)/ace/Strategies_T.i \ - $(ACE_ROOT)/ace/Strategies_T.cpp \ - $(ACE_ROOT)/ace/Service_Repository.h \ - $(ACE_ROOT)/ace/Service_Types.h \ - $(ACE_ROOT)/ace/Service_Types.i \ - $(ACE_ROOT)/ace/Service_Repository.i \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/WFMO_Reactor.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Connector.h \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.h \ - $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Task.i \ - $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Task_T.i \ - $(ACE_ROOT)/ace/Task_T.cpp \ - $(ACE_ROOT)/ace/Module.h \ - $(ACE_ROOT)/ace/Module.i \ - $(ACE_ROOT)/ace/Module.cpp \ - $(ACE_ROOT)/ace/Stream_Modules.h \ - $(ACE_ROOT)/ace/Stream_Modules.i \ - $(ACE_ROOT)/ace/Stream_Modules.cpp \ - $(ACE_ROOT)/ace/Dynamic.h \ - $(ACE_ROOT)/ace/Dynamic.i \ - $(ACE_ROOT)/ace/Singleton.h \ - $(ACE_ROOT)/ace/Singleton.i \ - $(ACE_ROOT)/ace/Singleton.cpp \ - $(ACE_ROOT)/ace/Svc_Handler.i \ - $(ACE_ROOT)/ace/Svc_Handler.cpp \ - $(ACE_ROOT)/ace/Connector.i \ - $(ACE_ROOT)/ace/Connector.cpp \ - $(ACE_ROOT)/ace/Acceptor.h \ - $(ACE_ROOT)/ace/Acceptor.i \ - $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/Align.h \ - $(TAO_ROOT)/tao/ORB.h \ - $(TAO_ROOT)/tao/Sequence.h \ - $(TAO_ROOT)/tao/Sequence.i \ - $(TAO_ROOT)/tao/Sequence_T.h \ - $(TAO_ROOT)/tao/Sequence_T.i \ - $(TAO_ROOT)/tao/Sequence_T.cpp \ - $(TAO_ROOT)/tao/Object_KeyC.h \ - $(TAO_ROOT)/tao/Object_KeyC.i \ - $(TAO_ROOT)/tao/ORB.i \ - $(TAO_ROOT)/tao/Exception.h \ - $(TAO_ROOT)/tao/Exception.i \ - $(TAO_ROOT)/tao/Any.h \ - $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ - $(TAO_ROOT)/tao/NVList.h \ - $(TAO_ROOT)/tao/NVList.i \ - $(TAO_ROOT)/tao/Principal.h \ - $(TAO_ROOT)/tao/Request.h \ - $(TAO_ROOT)/tao/Request.i \ - $(TAO_ROOT)/tao/Stub.h \ - $(TAO_ROOT)/tao/Stub.i \ - $(TAO_ROOT)/tao/Object.h \ - $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Typecode.h \ - $(TAO_ROOT)/tao/Typecode.i \ - $(TAO_ROOT)/tao/Marshal.h \ - $(TAO_ROOT)/tao/Marshal.i \ - $(TAO_ROOT)/tao/CDR.h \ - $(TAO_ROOT)/tao/CDR.i \ - $(TAO_ROOT)/tao/PolicyC.h \ - $(TAO_ROOT)/tao/PolicyC.i \ - $(TAO_ROOT)/tao/CurrentC.h \ - $(TAO_ROOT)/tao/CurrentC.i \ - $(TAO_ROOT)/tao/POA.h \ - $(TAO_ROOT)/tao/POAC.h \ - $(TAO_ROOT)/tao/POAC.i \ - $(TAO_ROOT)/tao/Servant_Base.h \ - $(TAO_ROOT)/tao/POAS.h \ - $(TAO_ROOT)/tao/POA_CORBA.h \ - $(TAO_ROOT)/tao/POAS.i \ - $(TAO_ROOT)/tao/Object_Table.h \ - $(TAO_ROOT)/tao/POA.i \ - $(TAO_ROOT)/tao/poa_macros.h \ - $(TAO_ROOT)/tao/Connect.h \ - $(TAO_ROOT)/tao/Connect.i \ - $(TAO_ROOT)/tao/ORB_Core.h \ - $(TAO_ROOT)/tao/ORB_Core.i \ - $(ACE_ROOT)/ace/Dynamic_Service.h \ - $(ACE_ROOT)/ace/Dynamic_Service.cpp \ - $(TAO_ROOT)/tao/Operation_Table.h \ - $(TAO_ROOT)/tao/debug.h \ - $(TAO_ROOT)/tao/IIOP_Object.h \ - $(TAO_ROOT)/tao/IIOP_Object.i \ - $(TAO_ROOT)/tao/IIOP_ORB.h \ - $(TAO_ROOT)/tao/IIOP_ORB.i \ - $(TAO_ROOT)/tao/IIOP_Interpreter.h \ - $(TAO_ROOT)/tao/GIOP.h \ - $(TAO_ROOT)/tao/GIOP.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ - Property_Exporter.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile index 9a73f45dc64..c54286b6d56 100644 --- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile @@ -42,7 +42,7 @@ endif DCFLAGS = -g LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS)) $(LINK.cc) $(LDFAGS) -o $@ $^ $(VLDLIBS) diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile index 564e44c12d5..1d744ec094b 100644 --- a/TAO/orbsvcs/tests/Concurrency/Makefile +++ b/TAO/orbsvcs/tests/Concurrency/Makefile @@ -237,7 +237,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -465,7 +464,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -693,7 +691,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -921,7 +918,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1146,7 +1142,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1372,7 +1367,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1598,7 +1592,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1828,7 +1821,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/tests/CosPropertyService/Makefile b/TAO/orbsvcs/tests/CosPropertyService/Makefile index 74bf5cefa79..42bf6623afe 100644 --- a/TAO/orbsvcs/tests/CosPropertyService/Makefile +++ b/TAO/orbsvcs/tests/CosPropertyService/Makefile @@ -13,11 +13,13 @@ LDLIBS = -lorbsvcs -lTAO CosProperty_SERVER_OBJS = server.o CosProperty_CLIENT_OBJS = client.o +SRC=server.cpp client.cpp BIN = server client BUILD = $(BIN) VLDLIBS = $(LDLIBS:%=%$(VAR)) + #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- @@ -26,7 +28,6 @@ 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.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU ifndef TAO_ROOT @@ -34,7 +35,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG) +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) server:$(addprefix $(VDIR),$(CosProperty_SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -49,6 +50,497 @@ realclean: clean # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - +.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \ + $(TAO_ROOT)/tao/TAO.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h +.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.h \ + $(ACE_ROOT)/ace/Synch.h \ + $(ACE_ROOT)/ace/ACE.h \ + $(ACE_ROOT)/ace/OS.h \ + $(ACE_ROOT)/ace/inc_user_config.h \ + $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ + $(ACE_ROOT)/ace/streams.h \ + $(ACE_ROOT)/ace/Basic_Types.h \ + $(ACE_ROOT)/ace/Basic_Types.i \ + $(ACE_ROOT)/ace/OS.i \ + $(ACE_ROOT)/ace/Trace.h \ + $(ACE_ROOT)/ace/Log_Msg.h \ + $(ACE_ROOT)/ace/Log_Record.h \ + $(ACE_ROOT)/ace/ACE.i \ + $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/Log_Record.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \ + $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \ + $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \ + $(ACE_ROOT)/ace/Synch.i \ + $(ACE_ROOT)/ace/Synch_T.h \ + $(ACE_ROOT)/ace/Event_Handler.h \ + $(ACE_ROOT)/ace/Event_Handler.i \ + $(ACE_ROOT)/ace/Synch_T.i \ + $(ACE_ROOT)/ace/Thread.h \ + $(ACE_ROOT)/ace/Thread.i \ + $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ + $(ACE_ROOT)/ace/Task.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ + $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ + $(ACE_ROOT)/ace/Malloc.i \ + $(ACE_ROOT)/ace/Malloc_T.h \ + $(ACE_ROOT)/ace/Free_List.h \ + $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ + $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ + $(ACE_ROOT)/ace/Memory_Pool.h \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/Task.i \ + $(ACE_ROOT)/ace/Task_T.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Service_Config.i \ + $(ACE_ROOT)/ace/Reactor.h \ + $(ACE_ROOT)/ace/Handle_Set.h \ + $(ACE_ROOT)/ace/Handle_Set.i \ + $(ACE_ROOT)/ace/Timer_Queue.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.h \ + $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ + $(ACE_ROOT)/ace/Reactor.i \ + $(ACE_ROOT)/ace/Reactor_Impl.h \ + $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.h \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ + $(ACE_ROOT)/ace/Get_Opt.h \ + $(ACE_ROOT)/ace/Get_Opt.i \ + $(TAO_ROOT)/tao/TAO.h \ + $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ + $(ACE_ROOT)/ace/SOCK_Stream.h \ + $(ACE_ROOT)/ace/SOCK_IO.h \ + $(ACE_ROOT)/ace/SOCK.h \ + $(ACE_ROOT)/ace/Addr.h \ + $(ACE_ROOT)/ace/Addr.i \ + $(ACE_ROOT)/ace/IPC_SAP.h \ + $(ACE_ROOT)/ace/IPC_SAP.i \ + $(ACE_ROOT)/ace/SOCK.i \ + $(ACE_ROOT)/ace/SOCK_IO.i \ + $(ACE_ROOT)/ace/INET_Addr.h \ + $(ACE_ROOT)/ace/INET_Addr.i \ + $(ACE_ROOT)/ace/SOCK_Stream.i \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Connector.h \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.h \ + $(ACE_ROOT)/ace/Dynamic.h \ + $(ACE_ROOT)/ace/Dynamic.i \ + $(ACE_ROOT)/ace/Singleton.h \ + $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ + $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ + $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ + $(ACE_ROOT)/ace/Acceptor.h \ + $(ACE_ROOT)/ace/Acceptor.i \ + $(ACE_ROOT)/ace/Acceptor.cpp \ + $(TAO_ROOT)/tao/Align.h \ + $(TAO_ROOT)/tao/ORB.h \ + $(TAO_ROOT)/tao/Sequence.h \ + $(TAO_ROOT)/tao/Sequence.i \ + $(TAO_ROOT)/tao/Sequence_T.h \ + $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ + $(TAO_ROOT)/tao/Object_KeyC.h \ + $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ + $(TAO_ROOT)/tao/ORB.i \ + $(TAO_ROOT)/tao/Exception.h \ + $(TAO_ROOT)/tao/Exception.i \ + $(TAO_ROOT)/tao/Any.h \ + $(TAO_ROOT)/tao/Any.i \ + $(TAO_ROOT)/tao/NVList.h \ + $(TAO_ROOT)/tao/NVList.i \ + $(TAO_ROOT)/tao/Principal.h \ + $(TAO_ROOT)/tao/Request.h \ + $(TAO_ROOT)/tao/Request.i \ + $(TAO_ROOT)/tao/Stub.h \ + $(TAO_ROOT)/tao/Stub.i \ + $(TAO_ROOT)/tao/Object.h \ + $(TAO_ROOT)/tao/Object.i \ + $(TAO_ROOT)/tao/Typecode.h \ + $(TAO_ROOT)/tao/Typecode.i \ + $(TAO_ROOT)/tao/Marshal.h \ + $(TAO_ROOT)/tao/Marshal.i \ + $(TAO_ROOT)/tao/CDR.h \ + $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ + $(TAO_ROOT)/tao/POA.h \ + $(TAO_ROOT)/tao/POAC.h \ + $(TAO_ROOT)/tao/POAC.i \ + $(TAO_ROOT)/tao/Servant_Base.h \ + $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ + $(TAO_ROOT)/tao/POAS.i \ + $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ + $(TAO_ROOT)/tao/Connect.h \ + $(TAO_ROOT)/tao/Connect.i \ + $(TAO_ROOT)/tao/ORB_Core.h \ + $(TAO_ROOT)/tao/ORB_Core.i \ + $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ + $(TAO_ROOT)/tao/Operation_Table.h \ + $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ + $(TAO_ROOT)/tao/IIOP_Object.h \ + $(TAO_ROOT)/tao/IIOP_Object.i \ + $(TAO_ROOT)/tao/IIOP_ORB.h \ + $(TAO_ROOT)/tao/IIOP_ORB.i \ + $(TAO_ROOT)/tao/IIOP_Interpreter.h \ + $(TAO_ROOT)/tao/GIOP.h \ + $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ + $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.h \ + $(ACE_ROOT)/ace/SOCK_Dgram.i \ + $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.h \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ + $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile index 0accd47b552..e353eb801d7 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile @@ -185,7 +185,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile index 83a42092803..288582c55e8 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/Makefile +++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile @@ -190,7 +190,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile index 347e314728a..92e093bd85c 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/Makefile +++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile @@ -216,7 +216,6 @@ realclean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -519,7 +518,6 @@ realclean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -813,7 +811,6 @@ realclean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1036,7 +1033,6 @@ realclean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1259,7 +1255,6 @@ realclean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile index ec28a1e7a59..bc213fc4790 100644 --- a/TAO/orbsvcs/tests/Event_Latency/Makefile +++ b/TAO/orbsvcs/tests/Event_Latency/Makefile @@ -36,7 +36,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) # Leave the scheduler output out if this is a config run. ifeq ($(runtime),1) @@ -207,7 +207,6 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile index 1c48f7643b0..35b636509a2 100644 --- a/TAO/orbsvcs/tests/Logger/Makefile +++ b/TAO/orbsvcs/tests/Logger/Makefile @@ -38,7 +38,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H server: $(addprefix $(VDIR),$(logger_SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -199,7 +199,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -436,7 +435,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/tests/Logger/client.h b/TAO/orbsvcs/tests/Logger/client.h index ce4230a310f..4e2742d9e6b 100644 --- a/TAO/orbsvcs/tests/Logger/client.h +++ b/TAO/orbsvcs/tests/Logger/client.h @@ -52,7 +52,7 @@ private: int parse_args (void); // Parses the arguments passed on the command line. - void setup_record (Logger::Log_Record newrec, + void setup_record (Logger::Log_Record &newrec, Logger::Log_Priority lp, const char* msg); // Prepares the logger recors for logging diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile index 3cad11fbd2c..57667638ca5 100644 --- a/TAO/orbsvcs/tests/Property/Makefile +++ b/TAO/orbsvcs/tests/Property/Makefile @@ -36,7 +36,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile index 01ffe50c783..1d0e42baf97 100644 --- a/TAO/orbsvcs/tests/Sched/Makefile +++ b/TAO/orbsvcs/tests/Sched/Makefile @@ -43,19 +43,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/Object_Manager.h \ - $(ACE_ROOT)/ace/Object_Manager.i \ - $(ACE_ROOT)/ace/Managed_Object.h \ - $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/OS.i \ $(ACE_ROOT)/ace/Trace.h \ $(ACE_ROOT)/ace/Log_Msg.h \ $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/Version.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ $(ACE_ROOT)/ace/Log_Record.i \ @@ -77,6 +73,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -90,6 +87,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Containers.i \ $(ACE_ROOT)/ace/Containers.cpp \ $(ACE_ROOT)/ace/Signal.i \ + $(ACE_ROOT)/ace/Object_Manager.h \ + $(ACE_ROOT)/ace/Object_Manager.i \ + $(ACE_ROOT)/ace/Managed_Object.h \ + $(ACE_ROOT)/ace/Managed_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ $(ACE_ROOT)/ace/Mem_Map.h \ $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ @@ -98,6 +100,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -111,11 +115,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/SchedEntry.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ $(TAO_ROOT)/tao/corba.h \ + $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/Get_Opt.h \ $(ACE_ROOT)/ace/Get_Opt.i \ $(ACE_ROOT)/ace/SOCK_Stream.h \ @@ -140,6 +143,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Strategies.h \ $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ + $(ACE_ROOT)/ace/Synch_Options.i \ + $(ACE_ROOT)/ace/Strategies_T.i \ $(ACE_ROOT)/ace/Strategies_T.cpp \ $(ACE_ROOT)/ace/Service_Repository.h \ $(ACE_ROOT)/ace/Service_Types.h \ @@ -150,9 +155,12 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/WFMO_Reactor.h \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ + $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ @@ -178,9 +186,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ - $(TAO_ROOT)/tao/orbconf.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -190,22 +195,12 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -215,21 +210,28 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(TAO_ROOT)/tao/Stub.i \ $(TAO_ROOT)/tao/Object.h \ $(TAO_ROOT)/tao/Object.i \ - $(TAO_ROOT)/tao/Server_Request.h \ - $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i \ $(TAO_ROOT)/tao/CDR.h \ $(TAO_ROOT)/tao/CDR.i \ + $(TAO_ROOT)/tao/PolicyC.h \ + $(TAO_ROOT)/tao/PolicyC.i \ + $(TAO_ROOT)/tao/CurrentC.h \ + $(TAO_ROOT)/tao/CurrentC.i \ $(TAO_ROOT)/tao/POA.h \ $(TAO_ROOT)/tao/POAC.h \ $(TAO_ROOT)/tao/POAC.i \ $(TAO_ROOT)/tao/Servant_Base.h \ $(TAO_ROOT)/tao/POAS.h \ + $(TAO_ROOT)/tao/POA_CORBA.h \ $(TAO_ROOT)/tao/POAS.i \ $(TAO_ROOT)/tao/Object_Table.h \ + $(TAO_ROOT)/tao/POA.i \ + $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -238,6 +240,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -245,6 +256,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ + $(TAO_ROOT)/tao/Server_Request.h \ + $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile index ecffe0d2c5e..a772916ad2f 100644 --- a/TAO/orbsvcs/tests/Sched_Conf/Makefile +++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile @@ -30,7 +30,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) Sched_Conf: $(addprefix $(VDIR),$(DUMP_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -48,6 +48,8 @@ Sched_Conf: $(addprefix $(VDIR),$(DUMP_OBJS)) $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ @@ -89,39 +91,39 @@ Sched_Conf: $(addprefix $(VDIR),$(DUMP_OBJS)) $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -129,61 +131,81 @@ Sched_Conf: $(addprefix $(VDIR),$(DUMP_OBJS)) $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -213,13 +235,25 @@ Sched_Conf: $(addprefix $(VDIR),$(DUMP_OBJS)) $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -227,6 +261,8 @@ Sched_Conf: $(addprefix $(VDIR),$(DUMP_OBJS)) $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -241,4 +277,3 @@ Sched_Conf: $(addprefix $(VDIR),$(DUMP_OBJS)) $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY - diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile index 660a0db3195..c734d811eee 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/Makefile +++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile @@ -36,7 +36,7 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. @@ -187,7 +187,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_O $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile index 3412538498c..7a61a55ba17 100644 --- a/TAO/orbsvcs/tests/Trading/Makefile +++ b/TAO/orbsvcs/tests/Trading/Makefile @@ -16,6 +16,10 @@ LIBNAME = libTTest LIB = $(LIBNAME).a SHLIB = $(LIBNAME).$(SOEXT) +ifndef TAO_ROOT +TAO_ROOT = $(ACE_ROOT)/TAO +endif + IDL_FILES = TTestC \ TTestS \ @@ -27,7 +31,7 @@ FILES = $(IDL_FILES) \ Simple_Dynamic LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG) \ +CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG) \ -DTAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG LSRC = $(addsuffix .cpp,$(FILES)) @@ -205,7 +209,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -276,10 +279,12 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h TTestC.i \ - TTestS.h TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i + $(TAO_ROOT)/tao/singletons.h \ + TTestC.i TTestS.h TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i .obj/TTestS.o .obj/TTestS.so .shobj/TTestS.o .shobj/TTestS.so: TTestS.cpp TTestS.h TTestC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -426,7 +431,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -497,10 +501,12 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h TTestC.i \ - TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i + $(TAO_ROOT)/tao/singletons.h \ + TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i .obj/TT_Info.o .obj/TT_Info.so .shobj/TT_Info.o .shobj/TT_Info.so: TT_Info.cpp TT_Info.h TTestS.h TTestC.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -647,7 +653,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -718,10 +723,12 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h TTestC.i \ - TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ + $(TAO_ROOT)/tao/singletons.h \ + TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ @@ -879,7 +886,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -950,15 +956,18 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h TTestC.i \ - TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ + $(TAO_ROOT)/tao/singletons.h \ + TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i .obj/Offer_Exporter.o .obj/Offer_Exporter.so .shobj/Offer_Exporter.o .shobj/Offer_Exporter.so: Offer_Exporter.cpp Offer_Exporter.h TT_Info.h \ - TTestS.h TTestC.h $(TAO_ROOT)/tao/corba.h \ + TTestS.h TTestC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -1103,7 +1112,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1174,10 +1182,12 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h TTestC.i \ - TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ + $(TAO_ROOT)/tao/singletons.h \ + TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ @@ -1191,7 +1201,8 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \ Simple_Dynamic.cpp .obj/Offer_Importer.o .obj/Offer_Importer.so .shobj/Offer_Importer.o .shobj/Offer_Importer.so: Offer_Importer.cpp Offer_Importer.h TT_Info.h \ - TTestS.h TTestC.h $(TAO_ROOT)/tao/corba.h \ + TTestS.h TTestC.h \ + $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ @@ -1336,7 +1347,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1407,10 +1417,12 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h TTestC.i \ - TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ + $(TAO_ROOT)/tao/singletons.h \ + TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \ @@ -1571,7 +1583,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1642,6 +1653,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile index f3b536fde73..37465ab520f 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile @@ -64,7 +64,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #CXX := purify $(CXX) LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/tao/compat +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs # pccTimer will eventually get integrated into ACE. It is specific for ClassiX on VME ifdef CHORUS @@ -244,7 +244,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -467,7 +466,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -695,7 +693,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -926,7 +923,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1170,7 +1166,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1399,7 +1394,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1641,7 +1635,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1866,7 +1859,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 087f898d76c..5d26fc54892 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -84,7 +84,7 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc, any_owns_data_ (any_owns_data), refcount_ (1) { - tc->AddRef (); + tc->_incr_refcnt (); // if the Any owns the data, we encode the "value" into a CDR stream and // store it. We also destroy the "value" since we own it. if (this->any_owns_data_) @@ -113,7 +113,7 @@ CORBA_Any::CORBA_Any (const CORBA_Any &src) { CORBA::Environment env; - this->type_->AddRef (); + this->type_->_incr_refcnt (); // does the source own its data? If not, then it is not in the message block // form and must be encoded. Else we must simply duplicate the message block @@ -143,7 +143,7 @@ CORBA_Any::operator= (const CORBA_Any &src) // check if it is a self assignment if (this == &src) { - this->AddRef (); + this->_incr_refcnt (); return *this; } @@ -167,12 +167,12 @@ CORBA_Any::operator= (const CORBA_Any &src) } if (this->type_) - this->type_->Release (); + this->type_->_decr_refcnt (); } // Now copy the contents of the source to ourselves. this->type_ = (src.type_) != 0 ? src.type_ : CORBA::_tc_null; - this->type_->AddRef (); + this->type_->_incr_refcnt (); this->value_ = 0; this->any_owns_data_ = CORBA::B_TRUE; this->refcount_ = 1; @@ -197,7 +197,7 @@ CORBA_Any::operator= (const CORBA_Any &src) // Destructor for an "Any" deep-frees memory if needed. // // NOTE that the assertion below will fire on application programmer -// errors, such as using AddRef/Release out of sync with the true +// errors, such as using _incr/_decr_refcnt out of sync with the true // lifetime of an Any value allocated on the stack. BUT it involves // changing the refcounting policy so that it's initialized to zero, // not one ... which policy affects the whole source base, and not @@ -230,7 +230,7 @@ CORBA_Any::~CORBA_Any (void) } if (this->type_) - this->type_->Release (); + this->type_->_decr_refcnt (); } @@ -244,7 +244,7 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc, { // we may be replacing ourselves. So before releasing our typecode, we // increment the refcount of the one that will be assigned to us. - tc->AddRef (); + tc->_incr_refcnt (); // decrement the refcount on the Message_Block we hold, it does not // matter if we own the data or not, because we always own the @@ -266,7 +266,7 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc, // release our current typecode if (this->type_ != 0) - this->type_->Release (); + this->type_->_decr_refcnt (); // assign new typecode this->type_ = tc; @@ -630,13 +630,13 @@ CORBA_Any::operator>>= (to_object obj) const } CORBA::ULong -CORBA_Any::AddRef (void) +CORBA_Any::_incr_refcnt (void) { return ++refcount_; } CORBA::ULong -CORBA_Any::Release (void) +CORBA_Any::_decr_refcnt (void) { { ACE_ASSERT (this != 0); diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index 30cc5dcd476..43e7627962a 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -269,8 +269,8 @@ public: // = Memory management methods. - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); // = Debugging method. diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index af39e05f2cf..0860b6a260b 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -16,7 +16,7 @@ CORBA_Current_ptr CORBA_Current::_duplicate (CORBA_Current_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -35,7 +35,7 @@ CORBA_Current_ptr CORBA_Current::_narrow ( || obj->_servant()->_downcast ("IDL:CORBA/Current:1.0") == 0 ) { - CORBA_Current_ptr new_obj = new CORBA_Current(obj->_get_parent ()); + CORBA_Current_ptr new_obj = new CORBA_Current(obj->_stubobj ()); return new_obj; } // end of if STUB_Object *stub = obj->_servant ()->_create_stub (env); diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index c87c23dddc7..4d5451aaa09 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -28,7 +28,7 @@ CORBA_Environment::exception (CORBA::Exception *ex) { this->clear (); this->exception_ = ex; - this->exception_->AddRef (); + this->exception_->_incr_refcnt (); } } @@ -41,7 +41,7 @@ void CORBA_Environment::clear (void) { if (this->exception_) - this->exception_->Release (); + this->exception_->_decr_refcnt (); this->exception_ = 0; } @@ -68,7 +68,7 @@ CORBA_Exception::CORBA_Exception (CORBA::TypeCode_ptr tc) refcount_ (0) { if (this->type_) - this->type_->AddRef (); + this->type_->_incr_refcnt (); assert (this->type_ != 0); } @@ -77,7 +77,7 @@ CORBA_Exception::CORBA_Exception (const CORBA_Exception &src) refcount_ (0) { if (this->type_) - this->type_->AddRef (); + this->type_->_incr_refcnt (); assert (this->type_ != 0); } @@ -95,10 +95,10 @@ CORBA_Exception & CORBA_Exception::operator = (const CORBA_Exception &src) { if (this->type_) - this->type_->Release (); + this->type_->_decr_refcnt (); this->type_ = src.type_; if (this->type_) - this->type_->AddRef (); + this->type_->_incr_refcnt (); assert (this->type_ != 0); return *this; @@ -128,13 +128,13 @@ CORBA_Exception::_is_a (const char* repository_id) const } CORBA::ULong -CORBA_Exception::AddRef (void) +CORBA_Exception::_incr_refcnt (void) { return ++this->refcount_; } CORBA::ULong -CORBA_Exception::Release (void) +CORBA_Exception::_decr_refcnt (void) { this->refcount_--; if (this->refcount_ != 0) @@ -160,10 +160,10 @@ CORBA_UserException & CORBA_UserException::operator = (const CORBA_UserException &src) { if (this->type_) - this->type_->Release (); + this->type_->_decr_refcnt (); this->type_ = src.type_; if (this->type_) - this->type_->AddRef (); + this->type_->_incr_refcnt (); assert (this->type_ != 0); return *this; @@ -209,10 +209,10 @@ CORBA_SystemException & CORBA_SystemException::operator = (const CORBA_SystemException &src) { if (this->type_) - this->type_->Release (); + this->type_->_decr_refcnt (); this->type_ = src.type_; if (this->type_) - this->type_->AddRef (); + this->type_->_incr_refcnt (); this->minor_ = src.minor_; this->completed_ = src.completed_; @@ -467,9 +467,8 @@ CORBA::Environment::print_exception (const char *info, if (this->exception_type () == CORBA::SYSTEM_EXCEPTION) { - // @@ this should be a QueryInterface call instead. CORBA::SystemException *x2 = - (CORBA::SystemException *) this->exception_; + CORBA_SystemException::_narrow (this->exception_); // @@ there are a other few "user exceptions" in the CORBA // scope, they're not all standard/system exceptions ... really diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index e64dee9da10..f1f14629f7f 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -63,8 +63,8 @@ public: virtual int _is_a (const char* repository_id) const; // = Methods required for memory management support. - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); protected: CORBA_Exception (void); @@ -227,8 +227,8 @@ public: // dtor CORBA::Exception_ptr exception (void) const; - // Return the exception. Caller must call AddRef() in order to keep - // the ptr. + // Return the exception. Caller must call _incr_refcnf() in order + // to keep the ptr. void exception (CORBA::Exception *ex); // Set the exception to <ex>, taking a reference on it. diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp index 94dc771fd1d..7a0c906d71c 100644 --- a/TAO/tao/IIOP_ORB.cpp +++ b/TAO/tao/IIOP_ORB.cpp @@ -89,27 +89,20 @@ IIOP_ORB::object_to_string (CORBA::Object_ptr obj, // This only works for IIOP objrefs. If we're handed an objref // that's not an IIOP objref, fail -- application must use an // ORB that's configured differently. + IIOP_Object *iiopobj = + ACE_dynamic_cast (IIOP_Object*, obj->_stubobj ()); - IIOP_Object *obj2; - - if (obj->QueryInterface (IID_IIOP_Object, - (void **) &obj2) != TAO_NOERROR) - { - env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); - return 0; - } - - if (!obj2) // null? + if (iiopobj == 0) return CORBA::string_copy ((CORBA::String) iiop_prefix); CORBA::String_var key; TAO_POA::encode_sequence_to_string (key.inout(), - obj2->profile.object_key); + iiopobj->profile.object_key); u_int buflen = (ACE_OS::strlen (iiop_prefix) + 1 /* major # */ + 1 /* minor # */ + 2 /* double-slash separator */ + - ACE_OS::strlen (obj2->profile.host) + + ACE_OS::strlen (iiopobj->profile.host) + 1 /* colon separator */ + 5 /* port number */ + 1 /* slash separator */ + @@ -118,9 +111,9 @@ IIOP_ORB::object_to_string (CORBA::Object_ptr obj, CORBA::String buf = CORBA::string_alloc (buflen); ACE_OS::sprintf (buf, "%s%c.%c//%s:%d/%s", iiop_prefix, - digits [obj2->profile.iiop_version.major], - digits [obj2->profile.iiop_version.minor], - obj2->profile.host, obj2->profile.port, + digits [iiopobj->profile.iiop_version.major], + digits [iiopobj->profile.iiop_version.minor], + iiopobj->profile.host, iiopobj->profile.port, key.in ()); return buf; @@ -221,7 +214,7 @@ iiop_string_to_object (CORBA::String string, else { env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); - data->Release (); + data->_decr_refcnt (); return 0; } @@ -229,7 +222,7 @@ iiop_string_to_object (CORBA::String string, || data->profile.iiop_version.minor > IIOP::MY_MINOR) { env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); - data->Release (); + data->_decr_refcnt (); return 0; } @@ -239,7 +232,7 @@ iiop_string_to_object (CORBA::String string, if (cp == 0) { env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); - data->Release (); + data->_decr_refcnt (); return 0; } @@ -259,7 +252,7 @@ iiop_string_to_object (CORBA::String string, env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); CORBA::string_free (data->profile.host); data->profile.host = 0; - data->Release (); + data->_decr_refcnt (); return 0; } @@ -280,7 +273,7 @@ iiop_string_to_object (CORBA::String string, // Set the ref_count on data to 1, which is correct, because only // obj has now a reference to it. - data->Release (); + data->_decr_refcnt (); return obj; } @@ -316,10 +309,12 @@ IIOP_ORB::_get_collocated_servant (STUB_Object *sobj) if (this->optimize_collocation_objects_ && sobj != 0) { - IIOP_Object *iiopobj; + IIOP_Object *iiopobj = + ACE_dynamic_cast (IIOP_Object*, sobj); + // Make sure users passed in an IIOP_Object otherwise, we don't // know what to do next. - if (sobj->QueryInterface (IID_IIOP_Object, (void **) &iiopobj) != TAO_NOERROR) + if (iiopobj == 0) { #if 0 ACE_ERROR ((LM_ERROR, diff --git a/TAO/tao/IIOP_Object.cpp b/TAO/tao/IIOP_Object.cpp index 4c0e652cb99..f513be8a982 100644 --- a/TAO/tao/IIOP_Object.cpp +++ b/TAO/tao/IIOP_Object.cpp @@ -279,21 +279,20 @@ CORBA::Boolean IIOP_Object::is_equivalent (CORBA::Object_ptr other_obj, CORBA::Environment &env) { - IIOP::Profile *body, *body2; - IIOP_Object *other_iiop_obj; - env.clear (); - if (CORBA::is_nil (other_obj) == CORBA::B_TRUE - || other_obj->QueryInterface (IID_IIOP_Object, - (void **) &other_iiop_obj) != TAO_NOERROR) + if (CORBA::is_nil (other_obj) == CORBA::B_TRUE) + return CORBA::B_FALSE; + + IIOP_Object *other_iiop_obj = + ACE_dynamic_cast (IIOP_Object*, other_obj->_stubobj ()); + if (other_iiop_obj == 0) return CORBA::B_FALSE; - CORBA::release (other_obj); // Compare all the bytes of the object address -- must be the same. - body = &profile; - body2 = &other_iiop_obj->profile; + IIOP::Profile *body = &profile; + IIOP::Profile *body2 = &other_iiop_obj->profile; ACE_ASSERT (body->object_key.length () < UINT_MAX); @@ -304,22 +303,18 @@ IIOP_Object::is_equivalent (CORBA::Object_ptr other_obj, && body->iiop_version.major == body2->iiop_version.major; } -// For COM -- IUnknown operations - -// {A201E4C3-F258-11ce-9598-0000C07CA898} -TAO_DEFINE_GUID (IID_IIOP_Object, -0xa201e4c3, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); +// Memory managment -ULONG -IIOP_Object::AddRef (void) +CORBA::ULong +IIOP_Object::_incr_refcnt (void) { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->IUnknown_lock_, 0)); return ++this->refcount_; } -ULONG -IIOP_Object::Release (void) +CORBA::ULong +IIOP_Object::_decr_refcnt (void) { { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->IUnknown_lock_, 0)); @@ -334,31 +329,6 @@ IIOP_Object::Release (void) return 0; } -// Note that (as of this writing) this is the only place all the -// interfaces to an "objref" come together: -// -// IUnknown ... this one -// STUB_OBJECT ... inherited by this one -// IIOP_OBJECT ... this one -// -TAO_HRESULT -IIOP_Object::QueryInterface (TAO_REFIID riid, - void **ppv) -{ - *ppv = 0; - - if (IID_IIOP_Object == riid - || IID_STUB_Object == riid - || IID_TAO_IUnknown == riid) - *ppv = this; - - if (*ppv == 0) - return TAO_ResultFromScode (TAO_E_NOINTERFACE); - - (void) AddRef (); - return TAO_NOERROR; -} - // TAO extensions TAO_ObjectKey* IIOP_Object::key (CORBA::Environment &) @@ -725,7 +695,7 @@ IIOP_Object::do_dynamic_call (const char *opname, { void *ptr = new CORBA::Octet [size]; - tcp->AddRef (); + tcp->_incr_refcnt (); result->value ()->replace (tcp, ptr, CORBA::B_TRUE, env); dexc (env, "do_dynamic_call, set result mem"); @@ -797,7 +767,7 @@ IIOP_Object::do_dynamic_call (const char *opname, { CORBA::Octet *ptr = new CORBA::Octet [size]; - tcp->AddRef (); + tcp->_incr_refcnt (); value->value ()->replace (tcp, ptr, CORBA::B_TRUE, env); dexc (env, "do_dynamic_call, set result mem"); diff --git a/TAO/tao/IIOP_Object.h b/TAO/tao/IIOP_Object.h index cdbccbb989a..b9ab230ada1 100644 --- a/TAO/tao/IIOP_Object.h +++ b/TAO/tao/IIOP_Object.h @@ -142,20 +142,20 @@ class TAO_Export IIOP_Object : public STUB_Object // interpreter that let static stubs be very small. It's // specific to objrefs with IIOP::Profile. public: - void do_static_call (CORBA::Environment &env, - const TAO_Call_Data *info, - ...); + virtual void do_static_call (CORBA::Environment &env, + const TAO_Call_Data *info, + ...); // SII-based "Stub interpreter" for static stubs. IDL compiler just // dumps a read-only description of the call into "calldata" and do // varargs calls to this routine, which does all the work. - void do_dynamic_call (const char *opname, - CORBA::Boolean is_roundtrip, - CORBA::NVList_ptr args, - CORBA::NamedValue_ptr result, - CORBA::Flags flags, - CORBA::ExceptionList &exceptions, - CORBA::Environment &env); + virtual void do_dynamic_call (const char *opname, + CORBA::Boolean is_roundtrip, + CORBA::NVList_ptr args, + CORBA::NamedValue_ptr result, + CORBA::Flags flags, + CORBA::ExceptionList &exceptions, + CORBA::Environment &env); // DII-based invocation analogue of the <do_static_call> above. // Differs in how the vararg calling convention is implemented -- // DII doesn't use the normal call stack with its implicit typing, @@ -200,10 +200,8 @@ public: // Constructor used typically by the server side. // = Memory management. - ULONG AddRef (void); - ULONG Release (void); - TAO_HRESULT QueryInterface (TAO_REFIID type_id, - void **ppv); + virtual CORBA::ULong _incr_refcnt (void); + virtual CORBA::ULong _decr_refcnt (void); virtual TAO_ObjectKey *key (CORBA::Environment &env); // Return the object key as an out parameter. Caller should release @@ -253,7 +251,7 @@ private: // Number of outstanding references to this object. ~IIOP_Object (void); - // Destructor is to be called only through Release() + // Destructor is to be called only through _decr_refcnt() // = Disallow copy constructor and assignment operator ACE_UNIMPLEMENTED_FUNC (IIOP_Object (const IIOP_Object &)) diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index 67366ad8519..791adc95f46 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -941,16 +941,14 @@ TAO_GIOP_Twoway_Invocation::location_forward (CORBA::Environment &env) // The object pointer has to be changed to a IIOP_Object pointer // in order to extract the profile. - IIOP_Object *iIOP_Object_ptr = 0; - - if (object_ptr->QueryInterface (IID_IIOP_Object, - (void **) &iIOP_Object_ptr) != TAO_NOERROR) - { - dexc (env, "invoke, location forward (QueryInterface)"); - TAO_GIOP::send_error (this->handler_); - return TAO_GIOP_SYSTEM_EXCEPTION; - } - + IIOP_Object *iiopobj = + ACE_dynamic_cast (IIOP_Object*, object_ptr->_stubobj ()); + + if (iiopobj == 0) + { + TAO_GIOP::send_error (this->handler_); + return TAO_GIOP_SYSTEM_EXCEPTION; + } // Make a copy of the IIOP profile in the forwarded objref, // reusing memory where practical. Then delete the forwarded @@ -963,14 +961,12 @@ TAO_GIOP_Twoway_Invocation::location_forward (CORBA::Environment &env) // related to correctness.) // the copy method on IIOP::Profile will be used to copy the content - data_->set_fwd_profile (&iIOP_Object_ptr->profile); + data_->set_fwd_profile (&iiopobj->profile); // store the new profile in the forwarding profile // note: this has to be and is thread safe // The object is no longer needed, because we have now the IIOP_Object CORBA::release (object_ptr); - // We have a refcount of 2 because of the Query_Inteface method. - CORBA::release (object_ptr); env.clear (); diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index 5807ec24a64..a43c5abd34c 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -72,9 +72,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -COMPATDIR = $(TAO_ROOT)/tao/compat -COMPATFILES = objbase.h initguid.h - BIN = # t-sizes DEFS = $(addsuffix .h,$(PUB_HDRS)) @@ -278,7 +275,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -500,7 +496,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -721,7 +716,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/corba.h \ @@ -944,7 +938,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1167,7 +1160,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1389,7 +1381,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1611,7 +1602,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1833,7 +1823,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2062,7 +2051,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2290,7 +2278,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2512,7 +2499,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2734,7 +2720,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2956,7 +2941,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3178,7 +3162,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3400,7 +3383,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3622,7 +3604,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3844,7 +3825,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4068,7 +4048,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4290,7 +4269,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4512,7 +4490,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4734,7 +4711,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4956,7 +4932,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5178,7 +5153,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5402,7 +5376,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5624,7 +5597,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5846,7 +5818,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6068,7 +6039,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6290,7 +6260,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6513,7 +6482,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6735,7 +6703,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6956,7 +6923,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7178,7 +7144,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7400,7 +7365,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7624,7 +7588,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7848,7 +7811,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8072,7 +8034,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8294,7 +8255,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8516,7 +8476,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8741,7 +8700,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -8963,7 +8921,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9185,7 +9142,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9418,7 +9374,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9640,7 +9595,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9862,7 +9816,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -9937,7 +9890,9 @@ endif # cxvx86 $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ - $(TAO_ROOT)/tao/singletons.h + $(TAO_ROOT)/tao/singletons.h \ + $(TAO_ROOT)/tao/Timeprobe.h \ + $(ACE_ROOT)/ace/Timeprobe.h .obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -10084,7 +10039,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -10307,7 +10261,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -10529,7 +10482,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -10751,7 +10703,6 @@ endif # cxvx86 $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i index a259da07fb9..431cc47fd9b 100644 --- a/TAO/tao/Marshal.i +++ b/TAO/tao/Marshal.i @@ -179,7 +179,7 @@ TAO_Marshal_TypeCode::deep_copy (CORBA::TypeCode_ptr, else dest = CORBA::_tc_null; - ((CORBA::TypeCode_ptr) dest)->AddRef (); + ((CORBA::TypeCode_ptr) dest)->_incr_refcnt (); return CORBA::TypeCode::TRAVERSE_CONTINUE; } @@ -238,7 +238,7 @@ TAO_Marshal_TypeCode::deep_free (CORBA::TypeCode_ptr, CORBA::Environment &) { if ((*(CORBA::TypeCode_ptr *) source) != 0) - (*(CORBA::TypeCode_ptr *) source)->Release (); + (*(CORBA::TypeCode_ptr *) source)->_decr_refcnt (); return CORBA::TypeCode::TRAVERSE_CONTINUE; } diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index a94e2ccf283..6d0ed1e942d 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -9,13 +9,13 @@ #endif /* ! __ACE_INLINE__ */ CORBA::ULong -CORBA_NamedValue::AddRef (void) +CORBA_NamedValue::_incr_refcnt (void) { return this->refcount_++; } CORBA::ULong -CORBA_NamedValue::Release (void) +CORBA_NamedValue::_decr_refcnt (void) { { ACE_ASSERT (this != 0); @@ -34,7 +34,7 @@ void CORBA::release (CORBA::NamedValue_ptr nv) { if (nv) - nv->Release (); + nv->_decr_refcnt (); } CORBA::Boolean @@ -56,13 +56,13 @@ CORBA_NamedValue::~CORBA_NamedValue (void) // =Methods on class NVList CORBA::ULong -CORBA_NVList::AddRef (void) +CORBA_NVList::_incr_refcnt (void) { return this->refcount_++; } CORBA::ULong -CORBA_NVList::Release (void) +CORBA_NVList::_decr_refcnt (void) { { ACE_ASSERT (this != 0); @@ -81,7 +81,7 @@ void CORBA::release (CORBA::NVList_ptr nvl) { if (nvl) - nvl->Release (); + nvl->_decr_refcnt (); } CORBA::Boolean diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h index 52b48eac605..87fe6fb211d 100644 --- a/TAO/tao/NVList.h +++ b/TAO/tao/NVList.h @@ -45,8 +45,8 @@ public: // = Methods required for COM IUnknown support. - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); private: u_int refcount_; @@ -129,8 +129,8 @@ public: // = Methods required for COM IUnknown support - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); private: CORBA_NVList (void); diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index d2977c02807..ff7e182ab82 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -44,12 +44,6 @@ int CORBA_ORB::orb_init_count_ = 0; CORBA::Boolean CORBA::B_FALSE = 0; CORBA::Boolean CORBA::B_TRUE = 1; -// COM's IUnknown support - -// {A201E4C7-F258-11ce-9598-0000C07CA898} -TAO_DEFINE_GUID (IID_STUB_Object, - 0xa201e4c7, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); - CORBA::String_var::String_var (char *p) : ptr_ (p) { @@ -178,8 +172,8 @@ CORBA_ORB::shutdown (CORBA::Boolean /* wait_for_completion */) return; } -ULONG -CORBA_ORB::Release (void) +CORBA::ULong +CORBA_ORB::_decr_refcnt (void) { { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0)); @@ -650,7 +644,7 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key, // Clean up in case of errors. if (new_obj == 0) { - data->Release (); + data->_decr_refcnt (); env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO)); } diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index c042e9a653f..0bcbc4c46c6 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -894,8 +894,8 @@ public: // provide some more of the CORBA support. Implementations of this // "CORBA::ORB" class must know how to create stringify/destringify // their objrefs, as well as how to marshal and unmarshal them. - ULONG AddRef (void); - ULONG Release (void); + virtual CORBA::ULong _incr_refcnt (void); + virtual CORBA::ULong _decr_refcnt (void); int open (void); // Set up the ORB Core's acceptor to listen on the @@ -1023,23 +1023,6 @@ typedef void (*TAO_Skeleton)(CORBA::ServerRequest &, void *, // context_ptr CORBA::Environment &); -// COM interface IIDs -extern "C" TAO_Export const TAO_IID IID_CORBA_Any; -extern "C" TAO_Export const TAO_IID IID_BOA; -extern "C" TAO_Export const TAO_IID IID_CORBA_Exception; -extern "C" TAO_Export const TAO_IID IID_CORBA_UserException; -extern "C" TAO_Export const TAO_IID IID_CORBA_SystemException; -extern "C" TAO_Export const TAO_IID IID_CORBA_Request; -extern "C" TAO_Export const TAO_IID IID_CORBA_Object; -extern "C" TAO_Export const TAO_IID IID_CORBA_ORB; -extern "C" TAO_Export const TAO_IID IID_CORBA_NVList; -extern "C" TAO_Export const TAO_IID IID_CORBA_Principal; -extern "C" TAO_Export const TAO_IID IID_CORBA_TypeCode; -extern "C" TAO_Export const TAO_IID IID_CORBA_ServerRequest; -extern "C" TAO_Export const TAO_IID IID_IIOP_ServerRequest; -extern "C" TAO_Export const TAO_IID IID_STUB_Object; -extern "C" TAO_Export const TAO_IID IID_IIOP_Object; - // NOTE: stub APIs are nonportable, and must be explicitly #included // by code emitted from an IDL compiler. diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i index a29a631feae..68391fe1b39 100644 --- a/TAO/tao/ORB.i +++ b/TAO/tao/ORB.i @@ -159,15 +159,15 @@ ACE_INLINE void CORBA::release (CORBA::ORB_ptr obj) { if (obj) - obj->Release (); + obj->_decr_refcnt (); } // --------------------------------------------------------------------------- // ORB specific // --------------------------------------------------------------------------- -ACE_INLINE ULONG -CORBA_ORB::AddRef (void) +ACE_INLINE CORBA::ULong +CORBA_ORB::_incr_refcnt (void) { ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, lock_, 0)); @@ -178,7 +178,7 @@ ACE_INLINE CORBA::ORB_ptr CORBA_ORB::_duplicate (CORBA::ORB_ptr obj) { if (obj) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 579f1514743..d5235b8b3cc 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -11,12 +11,9 @@ # include "tao/Object.i" #endif /* ! __ACE_INLINE__ */ -// GET_INTERFACE ... send a simple call to the object, it returns -// an InterfaceDef objref. - CORBA_Object::~CORBA_Object (void) { - this->parent_->Release (); + this->protocol_proxy_->_decr_refcnt (); } CORBA_Object_var::~CORBA_Object_var (void) // destructor @@ -34,22 +31,21 @@ CORBA_Object::CORBA_Object (STUB_Object *protocol_proxy, CORBA_Boolean collocated) : servant_ (servant), is_collocated_ (collocated), - parent_ (0), + protocol_proxy_ (protocol_proxy), refcount_ (1) { // Notice that the refcount_ above is initialized to 1 because // the semantics of CORBA Objects are such that obtaining one // implicitly takes a reference. - this->_set_parent (protocol_proxy); } -// CORBA dup/release build on top of COM's (why not). +// CORBA dup/release. void CORBA::release (CORBA_Object_ptr obj) { if (obj) - obj->Release (); + obj->_decr_refcnt (); } CORBA::InterfaceDef_ptr @@ -72,18 +68,6 @@ CORBA_Object::_get_interface (CORBA::Environment &env) CORBA::InterfaceDef_ptr retval = 0; - // At this time, we only have a single generic way to find the CORBA - // interface def for an object. - - STUB_Object *istub; - - if (QueryInterface (IID_STUB_Object, (void **) &istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - Release (); - // NOTE: If istub->type_id is nonzero, we could try asking a "local" // interface repository and avoid costly network I/O. (It's wrong // to have different data associated with the same interface ID in @@ -94,7 +78,9 @@ CORBA_Object::_get_interface (CORBA::Environment &env) // information though, since there's no guarantee that any local // interface repository will really have records of this particular // interface. - istub->do_static_call (env, &Object_get_interface_calldata, &retval); + this->_stubobj ()->do_static_call (env, + &Object_get_interface_calldata, + &retval); return retval; } @@ -122,18 +108,6 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, if (this->is_collocated_ && this->servant_ != 0) return this->servant_->_is_a (type_id, env); - // At this time, we only have a single generic way to check the type - // of an object. - STUB_Object *istub; - - if (QueryInterface (IID_STUB_Object, - (void **) &istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return CORBA::B_FALSE; - } - - Release (); // NOTE: if istub->type_id is nonzero and we have local knowledge of // it, we can answer this question without a costly remote call. @@ -151,8 +125,8 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, // // XXX if type_id is that of CORBA_Object, "yes, we comply" :-) - if ( ACE_static_cast(const char *, istub->type_id) != 0 - && ACE_OS::strcmp ((char *) type_id, (char *) istub->type_id) == 0) + if ( ACE_static_cast(const char *, this->_stubobj ()->type_id) != 0 + && ACE_OS::strcmp ((char *) type_id, (char *) this->_stubobj ()->type_id) == 0) return CORBA::B_TRUE; // Our local knowledge about this type is insufficient to say @@ -162,7 +136,9 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, CORBA::Boolean retval = CORBA::B_FALSE; - istub->do_static_call (env, &Object_is_a_calldata, &retval, &type_id); + this->_stubobj ()->do_static_call (env, + &Object_is_a_calldata, + &retval, &type_id); return retval; } @@ -184,40 +160,10 @@ CORBA_Object::_is_collocated (void) const return this->is_collocated_; } -// GET_IMPLEMENTATION ... send a simple call to the object, it returns -// an ImplementationDef objref. - CORBA::ImplementationDef_ptr CORBA_Object::_get_implementation (CORBA::Environment &env) { - static const TAO_Param_Data Object_get_implementation_params [] = - { - { CORBA::_tc_Object, PARAM_RETURN, 0 } - // XXX should be tc_ImplementationDef - }; - - static const TAO_Call_Data Object_get_implementation_calldata = - { - "_implementation", - CORBA::B_TRUE, - 1, - &Object_get_implementation_params [0], - 0, 0 - }; - - STUB_Object *istub; - CORBA::ImplementationDef_ptr retval = 0; - - if (QueryInterface (IID_STUB_Object, - (void **) &istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - Release (); - - istub->do_static_call (env, &Object_get_implementation_calldata, &retval); - return retval; + return 0; } // NON_EXISTENT ... send a simple call to the object, which will @@ -240,17 +186,10 @@ CORBA_Object::_non_existent (CORBA::Environment &env) }; CORBA::Boolean retval = CORBA::B_FALSE; - STUB_Object *istub; - if (QueryInterface (IID_STUB_Object, - (void **) &istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return CORBA::B_FALSE; - } - Release (); - - istub->do_static_call (env, &Object_non_existent_calldata, &retval); + this->_stubobj ()->do_static_call (env, + &Object_non_existent_calldata, + &retval); CORBA::Exception *x = env.exception (); @@ -272,17 +211,7 @@ CORBA::ULong CORBA_Object::_hash (CORBA::ULong maximum, CORBA::Environment &env) { - STUB_Object *istub; - - if (QueryInterface (IID_STUB_Object, - (void **) &istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return CORBA::B_FALSE; - } - Release (); - - return istub->hash (maximum, env); + return this->_stubobj ()->hash (maximum, env); } // Compare two object references to see if they point to the same @@ -295,23 +224,13 @@ CORBA::Boolean CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj, CORBA::Environment &env) { - STUB_Object *istub; - if (other_obj == this) { env.clear (); return CORBA::B_TRUE; } - if (QueryInterface (IID_STUB_Object, - (void **) &istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return CORBA::B_FALSE; - } - Release (); - - return istub->is_equivalent (other_obj, env); + return this->_stubobj ()->is_equivalent (other_obj, env); } // TAO's extensions @@ -319,45 +238,5 @@ CORBA_Object::_is_equivalent (CORBA_Object_ptr other_obj, TAO_ObjectKey * CORBA::Object::_key (CORBA::Environment &env) { - STUB_Object *istub; - - if (QueryInterface (IID_STUB_Object, - (void **) &istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return 0; - } - Release (); - - if (istub) - return istub->key (env); - - return 0; //otherwise -} - -STUB_Object * -CORBA_Object::stubobj (CORBA::Environment &env) -{ - STUB_Object *istub; - - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return 0; - } - this->Release (); // QueryInterface has bumped up our refcount - return istub; + return this->_stubobj ()->key (env); } - - -// COM's IUnknown support - -// XXX this is not the GUID that Microsoft uses. It can matter. - -// {77420089-F276-11ce-9598-0000C07CA898} -TAO_DEFINE_GUID (IID_TAO_IUnknown, -0x77420089, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); - -// {A201E4C2-F258-11ce-9598-0000C07CA898} -TAO_DEFINE_GUID (IID_CORBA_Object, -0xa201e4c2, 0xf258, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 9fc5672b84d..20c33bd9e5d 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -28,7 +28,7 @@ class TAO_ServantBase; class STUB_Object; -class TAO_Export CORBA_Object : public TAO_IUnknown +class TAO_Export CORBA_Object { public: static CORBA::Object_ptr _duplicate (CORBA::Object_ptr obj); @@ -60,7 +60,10 @@ public: virtual CORBA::Boolean _is_collocated (void) const; // are we collocated with the servant? - virtual CORBA::ImplementationDef_ptr _get_implementation (CORBA::Environment &); + virtual CORBA::ImplementationDef_ptr + _get_implementation (CORBA::Environment &); + // This method is deprecated in the CORBA 2.2 spec, we just return 0 + // every time. virtual CORBA::Boolean _non_existent (CORBA::Environment &); @@ -94,15 +97,9 @@ public: virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj, CORBA::Environment &env); - // = COM-like IUnknown Support - // - // This class is intended to aggregate or be contained with others, - // which in combination provide all requisite CORBA/COM support. - - ULONG AddRef (void); - ULONG Release (void); - TAO_HRESULT QueryInterface (TAO_REFIID riid, - void **ppv); + // = Reference count managment. + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); CORBA_Object (STUB_Object *p = 0, TAO_ServantBase *servant = 0, @@ -116,17 +113,9 @@ public: // Return the object key as an out parameter. Caller should release // return value when finished with it. - virtual STUB_Object *stubobj (CORBA::Environment &env); + virtual STUB_Object *_stubobj (void); // get the underlying stub object - // = Non-standard - - void _set_parent (STUB_Object *p); - // Set the protocol proxy object. - - STUB_Object *_get_parent (void) const; - // Get the protocol proxy object. - protected: TAO_ServantBase *servant_; // Servant pointer. It is 0 except for collocated objects. @@ -136,15 +125,13 @@ protected: // objects. private: - STUB_Object *parent_; + STUB_Object *protocol_proxy_; // Pointer to the protocol-specific "object" containing important // profiling information regarding this proxy. - // - // This used to be a TAO_IUnknown, but that seemed overtly general. - // It's changed to a STUB_Object to make the relationship of the - // target more explicit and sensible. + // The protocol proxy is (potentially) shared among several + // CORBA_Objects - u_int refcount_; + CORBA::ULong refcount_; // Number of outstanding references to this object. // = Unimplemented methods diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index ce0d47b1714..db51f7d3b0c 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -2,14 +2,14 @@ // = methods for class CORBA_Object -ACE_INLINE ULONG -CORBA_Object::AddRef (void) +ACE_INLINE CORBA::ULong +CORBA_Object::_incr_refcnt (void) { return ++this->refcount_; } -ACE_INLINE ULONG -CORBA_Object::Release (void) +ACE_INLINE CORBA::ULong +CORBA_Object::_decr_refcnt (void) { if (--this->refcount_ != 0) return this->refcount_; @@ -17,31 +17,11 @@ CORBA_Object::Release (void) return 0; } -ACE_INLINE TAO_HRESULT -CORBA_Object::QueryInterface (TAO_REFIID riid, - void **ppv) -{ - *ppv = 0; - - if (IID_IIOP_Object == riid - || IID_STUB_Object == riid - || IID_TAO_IUnknown == riid) - *ppv = this->parent_; - else if (IID_CORBA_Object == riid) - *ppv = this; - - if (*ppv == 0) - return TAO_ResultFromScode (TAO_E_NOINTERFACE); - - (void) this->AddRef (); - return TAO_NOERROR; -} - ACE_INLINE CORBA_Object_ptr CORBA_Object::_duplicate (CORBA::Object_ptr obj) { if (obj) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } @@ -59,26 +39,10 @@ CORBA::is_nil (CORBA::Object_ptr obj) return (CORBA::Boolean) (obj == 0); } -ACE_INLINE void -CORBA_Object::_set_parent (STUB_Object *p) -{ - if (p != 0 && p->AddRef () != 0) - { - // Release the one we had. - if (this->parent_) - this->parent_->Release (); - - // Hold on to the new one - this->parent_ = p; - } - - ACE_ASSERT (this->parent_ != 0); -} - ACE_INLINE STUB_Object * -CORBA_Object::_get_parent (void) const +CORBA_Object::_stubobj (void) { - return this->parent_; + return this->protocol_proxy_; } // DII hook to objref diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp index 3e1f9b5efed..1673145bba1 100644 --- a/TAO/tao/POAC.cpp +++ b/TAO/tao/POAC.cpp @@ -167,7 +167,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicyValue = &_tc__tc_PortableSer PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (PortableServer::ThreadPolicy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -183,7 +183,7 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( return PortableServer::ThreadPolicy::_nil (); if (!obj->_is_collocated () || !obj->_servant()) { - PortableServer::ThreadPolicy_ptr new_obj = new PortableServer::ThreadPolicy (obj->_get_parent ()); // construct obj ref using the stub object + PortableServer::ThreadPolicy_ptr new_obj = new PortableServer::ThreadPolicy (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -208,15 +208,9 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env PortableServer::ThreadPolicyValue retval = ACE_static_cast (PortableServer::ThreadPolicyValue, -1); - STUB_Object *istub; - - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &_get_PortableServer_ThreadPolicy_value_calldata, &retval); + this->_stubobj ()->do_static_call (env, + &_get_PortableServer_ThreadPolicy_value_calldata, + &retval); return retval; } @@ -257,7 +251,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicyValue = &_tc__tc_PortableS PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (PortableServer::LifespanPolicy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -273,7 +267,7 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( return PortableServer::LifespanPolicy::_nil (); if (!obj->_is_collocated () || !obj->_servant()) { - PortableServer::LifespanPolicy_ptr new_obj = new PortableServer::LifespanPolicy (obj->_get_parent ()); // construct obj ref using the stub object + PortableServer::LifespanPolicy_ptr new_obj = new PortableServer::LifespanPolicy (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -298,15 +292,8 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA: PortableServer::LifespanPolicyValue retval = ACE_static_cast (PortableServer::LifespanPolicyValue, -1); - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &_get_PortableServer_LifespanPolicy_value_calldata, &retval); + this->_stubobj ()->do_static_call (env, &_get_PortableServer_LifespanPolicy_value_calldata, &retval); return retval; } @@ -347,7 +334,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicyValue = &_tc__tc_Porta PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_duplicate (PortableServer::IdUniquenessPolicy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -363,7 +350,7 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narr return PortableServer::IdUniquenessPolicy::_nil (); if (!obj->_is_collocated () || !obj->_servant()) { - PortableServer::IdUniquenessPolicy_ptr new_obj = new PortableServer::IdUniquenessPolicy (obj->_get_parent ()); // construct obj ref using the stub object + PortableServer::IdUniquenessPolicy_ptr new_obj = new PortableServer::IdUniquenessPolicy (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -388,15 +375,8 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu PortableServer::IdUniquenessPolicyValue retval = ACE_static_cast (PortableServer::IdUniquenessPolicyValue, -1); - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &_get_PortableServer_IdUniquenessPolicy_value_calldata, &retval); + this->_stubobj ()->do_static_call (env, &_get_PortableServer_IdUniquenessPolicy_value_calldata, &retval); return retval; } @@ -437,7 +417,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicyValue = &_tc__tc_Porta PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_duplicate (PortableServer::IdAssignmentPolicy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -453,7 +433,7 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narr return PortableServer::IdAssignmentPolicy::_nil (); if (!obj->_is_collocated () || !obj->_servant()) { - PortableServer::IdAssignmentPolicy_ptr new_obj = new PortableServer::IdAssignmentPolicy (obj->_get_parent ()); // construct obj ref using the stub object + PortableServer::IdAssignmentPolicy_ptr new_obj = new PortableServer::IdAssignmentPolicy (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -478,15 +458,8 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu PortableServer::IdAssignmentPolicyValue retval = ACE_static_cast (PortableServer::IdAssignmentPolicyValue, -1); - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &_get_PortableServer_IdAssignmentPolicy_value_calldata, &retval); + this->_stubobj ()->do_static_call (env, &_get_PortableServer_IdAssignmentPolicy_value_calldata, &retval); return retval; } @@ -527,7 +500,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicyValue = &_tc__tc PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_duplicate (PortableServer::ImplicitActivationPolicy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -543,7 +516,7 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP return PortableServer::ImplicitActivationPolicy::_nil (); if (!obj->_is_collocated () || !obj->_servant()) { - PortableServer::ImplicitActivationPolicy_ptr new_obj = new PortableServer::ImplicitActivationPolicy (obj->_get_parent ()); // construct obj ref using the stub object + PortableServer::ImplicitActivationPolicy_ptr new_obj = new PortableServer::ImplicitActivationPolicy (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -568,15 +541,8 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation PortableServer::ImplicitActivationPolicyValue retval = ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, -1); - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &_get_PortableServer_ImplicitActivationPolicy_value_calldata, &retval); + this->_stubobj ()->do_static_call (env, &_get_PortableServer_ImplicitActivationPolicy_value_calldata, &retval); return retval; } @@ -617,7 +583,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicyValue = &_tc__tc_P PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_duplicate (PortableServer::ServantRetentionPolicy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -633,7 +599,7 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic return PortableServer::ServantRetentionPolicy::_nil (); if (!obj->_is_collocated () || !obj->_servant()) { - PortableServer::ServantRetentionPolicy_ptr new_obj = new PortableServer::ServantRetentionPolicy (obj->_get_parent ()); // construct obj ref using the stub object + PortableServer::ServantRetentionPolicy_ptr new_obj = new PortableServer::ServantRetentionPolicy (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -658,15 +624,8 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli PortableServer::ServantRetentionPolicyValue retval = ACE_static_cast (PortableServer::ServantRetentionPolicyValue, -1); - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &_get_PortableServer_ServantRetentionPolicy_value_calldata, &retval); + this->_stubobj ()->do_static_call (env, &_get_PortableServer_ServantRetentionPolicy_value_calldata, &retval); return retval; } @@ -708,7 +667,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicyValue = &_tc__tc_ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_duplicate (PortableServer::RequestProcessingPolicy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -725,7 +684,7 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol if (!obj->_is_collocated () || !obj->_servant()) { PortableServer::RequestProcessingPolicy_ptr - new_obj = new PortableServer::RequestProcessingPolicy (obj->_get_parent ()); // construct obj ref using the stub object + new_obj = new PortableServer::RequestProcessingPolicy (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -750,15 +709,8 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo PortableServer::RequestProcessingPolicyValue retval = ACE_static_cast (PortableServer::RequestProcessingPolicyValue, -1); - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &_get_PortableServer_RequestProcessingPolicy_value_calldata, &retval); + this->_stubobj ()->do_static_call (env, &_get_PortableServer_RequestProcessingPolicy_value_calldata, &retval); return retval; } @@ -805,7 +757,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_SynchronizationPolicyValue = &_tc__tc_Po PortableServer::SynchronizationPolicy_ptr PortableServer::SynchronizationPolicy::_duplicate (PortableServer::SynchronizationPolicy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -822,7 +774,7 @@ PortableServer::SynchronizationPolicy_ptr PortableServer::SynchronizationPolicy: if (!obj->_is_collocated () || !obj->_servant()) { PortableServer::SynchronizationPolicy_ptr - new_obj = new PortableServer::SynchronizationPolicy (obj->_get_parent ()); // construct obj ref using the stub object + new_obj = new PortableServer::SynchronizationPolicy (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -847,15 +799,8 @@ PortableServer::SynchronizationPolicyValue PortableServer::SynchronizationPolicy PortableServer::SynchronizationPolicyValue retval = ACE_static_cast (PortableServer::SynchronizationPolicyValue, -1); - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return retval; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &_get_PortableServer_SynchronizationPolicy_value_calldata, &retval); + this->_stubobj ()->do_static_call (env, &_get_PortableServer_SynchronizationPolicy_value_calldata, &retval); return retval; } @@ -883,7 +828,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_SynchronizationPolicy = &_tc__tc_Portabl PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableServer::POAManager_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -1024,7 +969,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_POAManager = &_tc__tc_PortableServer_POA PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicate (PortableServer::AdapterActivator_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -1077,7 +1022,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_AdapterActivator = &_tc__tc_PortableServ PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (PortableServer::ServantManager_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -1130,7 +1075,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_ServantManager = &_tc__tc_PortableServer PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicate (PortableServer::ServantActivator_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -1184,7 +1129,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_ServantActivator = &_tc__tc_PortableServ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (PortableServer::ServantLocator_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -1238,7 +1183,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_ServantLocator = &_tc__tc_PortableServer PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -2268,7 +2213,7 @@ CORBA::TypeCode_ptr PortableServer::_tc_POA = &_tc__tc_PortableServer_POA; PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer::Current_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -2285,7 +2230,7 @@ PortableServer::Current_ptr PortableServer::Current::_narrow ( if (!obj->_is_collocated () || !obj->_servant()) { PortableServer::Current_ptr - new_obj = new PortableServer::Current (obj->_get_parent ()); // construct obj ref using the stub object + new_obj = new PortableServer::Current (obj->_stubobj ()); // construct obj ref using the stub object return new_obj; } // end of if @@ -2404,15 +2349,8 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro {"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata, 0, 0}; PortableServer::ObjectId *retval = 0; - STUB_Object *istub; - if (this->QueryInterface (IID_STUB_Object, (void **)&istub) != TAO_NOERROR) - { - env.exception (new CORBA::DATA_CONVERSION (CORBA::COMPLETED_NO)); - return 0; - } - this->Release (); // QueryInterface has bumped up our refcount - istub->do_static_call (env, &PortableServer_Current_get_object_id_calldata, &retval); + this->_stubobj ()->do_static_call (env, &PortableServer_Current_get_object_id_calldata, &retval); return retval; } diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 76911a69444..4f7afb9596f 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -18,7 +18,7 @@ CORBA_Policy_ptr CORBA_Policy::_duplicate (CORBA_Policy_ptr obj) { if (!CORBA::is_nil (obj)) - obj->AddRef (); + obj->_incr_refcnt (); return obj; } // end of _duplicate @@ -37,7 +37,7 @@ CORBA_Policy_ptr CORBA_Policy::_narrow ( || obj->_servant()->_downcast ("IDL:CORBA/Policy:1.0") == 0 ) { - CORBA_Policy_ptr new_obj = new CORBA_Policy(obj->_get_parent ()); + CORBA_Policy_ptr new_obj = new CORBA_Policy(obj->_stubobj ()); return new_obj; } // end of if STUB_Object *stub = obj->_servant ()->_create_stub (env); @@ -68,7 +68,7 @@ CORBA::PolicyType CORBA_Policy::policy_type ( {"_get_policy_type", 1, 1, _get_CORBA_Policy_policy_type_paramdata, 0, 0}; CORBA::PolicyType _tao_retval = 0; - STUB_Object *istub = this->stubobj (_tao_environment); + STUB_Object *istub = this->_stubobj (); if (istub) { istub->do_static_call ( @@ -93,7 +93,7 @@ CORBA_Policy_ptr CORBA_Policy::copy ( {"copy", 1, 1, CORBA_Policy_copy_paramdata, 0, 0}; CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil (); - STUB_Object *istub = this->stubobj (_tao_environment); + STUB_Object *istub = this->_stubobj (); if (istub) { CORBA::Object_ptr _tao_base_retval = CORBA::Object::_nil (); @@ -120,7 +120,7 @@ void CORBA_Policy::destroy ( static const TAO_Call_Data CORBA_Policy_destroy_calldata = {"destroy", 1, 1, CORBA_Policy_destroy_paramdata, 0, 0}; - STUB_Object *istub = this->stubobj (_tao_environment); + STUB_Object *istub = this->_stubobj (); if (istub) { istub->do_static_call ( diff --git a/TAO/tao/Principal.cpp b/TAO/tao/Principal.cpp index 5798da4ad93..87d2b4532e3 100644 --- a/TAO/tao/Principal.cpp +++ b/TAO/tao/Principal.cpp @@ -14,7 +14,7 @@ void CORBA::release (CORBA::Principal_ptr principal) { if (principal) - principal->Release (); + principal->_decr_refcnt (); } CORBA::Boolean @@ -33,13 +33,13 @@ CORBA_Principal::~CORBA_Principal (void) } CORBA::ULong -CORBA_Principal::AddRef (void) +CORBA_Principal::_incr_refcnt (void) { return ++refcount_; } CORBA::ULong -CORBA_Principal::Release (void) +CORBA_Principal::_decr_refcnt (void) { { if (--refcount_ != 0) diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h index 690e6e666a4..b2ddda02264 100644 --- a/TAO/tao/Principal.h +++ b/TAO/tao/Principal.h @@ -36,8 +36,8 @@ public: // @@ add "==", "<", ">" operators // = Stuff required for memory management. - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); CORBA_Principal (void); diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp index b2c5e1ace74..c2cda20144b 100644 --- a/TAO/tao/Request.cpp +++ b/TAO/tao/Request.cpp @@ -7,13 +7,13 @@ #endif /* ! __ACE_INLINE__ */ CORBA::ULong -CORBA_Request::AddRef (void) +CORBA_Request::_incr_refcnt (void) { return refcount_++; } CORBA::ULong -CORBA_Request::Release (void) +CORBA_Request::_decr_refcnt (void) { ACE_ASSERT (this != 0); @@ -30,7 +30,7 @@ void CORBA::release (CORBA::Request_ptr req) { if (req) - req->Release (); + req->_decr_refcnt (); } CORBA::Boolean @@ -89,8 +89,8 @@ CORBA_Request::~CORBA_Request (void) void CORBA_Request::invoke (void) { - STUB_Object *stub = this->target_->_get_parent (); - stub->AddRef (); + STUB_Object *stub = this->target_->_stubobj (); + stub->_incr_refcnt (); stub->do_dynamic_call ((char *) opname_, CORBA::B_TRUE, @@ -99,14 +99,14 @@ CORBA_Request::invoke (void) flags_, exceptions_, env_); - stub->Release (); + stub->_decr_refcnt (); } void CORBA_Request::send_oneway (void) { - STUB_Object *stub = this->target_->_get_parent (); - stub->AddRef (); + STUB_Object *stub = this->target_->_stubobj (); + stub->_incr_refcnt (); stub->do_dynamic_call ((char *) opname_, CORBA::B_FALSE, @@ -115,5 +115,5 @@ CORBA_Request::send_oneway (void) flags_, exceptions_, env_); - stub->Release (); + stub->_decr_refcnt (); } diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h index de245329af1..4bd7e9a2fcd 100644 --- a/TAO/tao/Request.h +++ b/TAO/tao/Request.h @@ -58,8 +58,8 @@ public: // Send a oneway request. // = Required for COM IUnknown support - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); private: friend class CORBA_Object; diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp index 45b000e2272..ac6731b4c98 100644 --- a/TAO/tao/Server_Request.cpp +++ b/TAO/tao/Server_Request.cpp @@ -32,20 +32,12 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ -// {77420086-F276-11ce-9598-0000C07CA898} -TAO_DEFINE_GUID (IID_IIOP_ServerRequest, -0x77420086, 0xf276, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); - -// {4B48D881-F7F0-11ce-9598-0000C07CA898} -TAO_DEFINE_GUID (IID_CORBA_ServerRequest, -0x4b48d881, 0xf7f0, 0x11ce, 0x95, 0x98, 0x0, 0x0, 0xc0, 0x7c, 0xa8, 0x98); - CORBA_ServerRequest * CORBA_ServerRequest::_duplicate (CORBA_ServerRequest *req) { if (req) { - req->AddRef (); + req->_incr_refcnt (); return req; } return (CORBA_ServerRequest *) 0; @@ -155,15 +147,15 @@ IIOP_ServerRequest::~IIOP_ServerRequest (void) delete this->exception_; } -ULONG -IIOP_ServerRequest::AddRef (void) +CORBA::ULong +IIOP_ServerRequest::_incr_refcnt (void) { ACE_ASSERT (this->refcount_ > 0); return this->refcount_++; } -ULONG -IIOP_ServerRequest::Release (void) +CORBA::ULong +IIOP_ServerRequest::_decr_refcnt (void) { ACE_ASSERT (this != 0); @@ -174,25 +166,6 @@ IIOP_ServerRequest::Release (void) return 0; } -TAO_HRESULT -IIOP_ServerRequest::QueryInterface (TAO_REFIID riid, - void **ppv) -{ - ACE_ASSERT (this->refcount_ > 0); - *ppv = 0; - - if (IID_IIOP_ServerRequest == riid - || IID_CORBA_ServerRequest == riid - || IID_TAO_IUnknown == riid) - *ppv = this; - - if (*ppv == 0) - return TAO_ResultFromScode (TAO_E_NOINTERFACE); - - (void) this->AddRef (); - return TAO_NOERROR; -} - // Unmarshal in/inout params, and set up to marshal the appropriate // inout/out/return values later on. @@ -228,7 +201,7 @@ IIOP_ServerRequest::arguments (CORBA::NVList_ptr &list, CORBA::Any_ptr any = nv->value (); CORBA::TypeCode_ptr tc = any->type (); - tc->AddRef (); + tc->_incr_refcnt (); void *value; if (!any->value ()) @@ -244,14 +217,15 @@ IIOP_ServerRequest::arguments (CORBA::NVList_ptr &list, // Decrement the refcount of "tc". // - // The earlier AddRef is needed since Any::replace () releases - // the typecode inside the Any. Without the dup, the reference - // count can go to zero, and the typecode would then be deleted. + // The earlier _incr_refcnt is needed since Any::replace () + // releases the typecode inside the Any. Without the dup, + // the reference count can go to zero, and the typecode + // would then be deleted. // - // This Release ensures that the reference count is correct so - // the typecode can be deleted some other time. + // This _decr_refcnt ensures that the reference count is + // correct so the typecode can be deleted some other time. - tc->Release (); + tc->_decr_refcnt (); } else value = (void *)any->value (); // memory was already preallocated diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h index a3d590afe90..c319695f196 100644 --- a/TAO/tao/Server_Request.h +++ b/TAO/tao/Server_Request.h @@ -89,7 +89,7 @@ public: }; -class TAO_Export CORBA_ServerRequest : public TAO_IUnknown +class TAO_Export CORBA_ServerRequest { // = TITLE // Class representing a CORBA ServerRequest object. @@ -174,6 +174,10 @@ public: virtual CORBA::Boolean response_expected (void) const = 0; // is the response expected + + // = Stuff required for memory management. + virtual CORBA::ULong _incr_refcnt (void) = 0; + virtual CORBA::ULong _decr_refcnt (void) = 0; }; class TAO_Export IIOP_ServerRequest : public CORBA_ServerRequest @@ -258,11 +262,9 @@ public: virtual const TAO_GIOP_ServiceContextList &service_info (void) const; - // = Stuff required for memory management and COM - ULONG AddRef (void); - ULONG Release (void); - TAO_HRESULT QueryInterface (TAO_REFIID riid, - void **ppv); + // = Stuff required for memory management. + virtual CORBA::ULong _incr_refcnt (void); + virtual CORBA::ULong _decr_refcnt (void); // To handle System Exceptions at the lowest level, // a method returning the request_id_ is needed. @@ -301,7 +303,7 @@ private: CORBA::ULong exception_type_; // exception type (will be NO_EXCEPTION in the majority of the cases) - u_int refcount_; + CORBA::ULong refcount_; // Number of things hold references to here. CORBA::ORB_ptr orb_; diff --git a/TAO/tao/Server_Request.i b/TAO/tao/Server_Request.i index c888c5cf6f3..d625019dda8 100644 --- a/TAO/tao/Server_Request.i +++ b/TAO/tao/Server_Request.i @@ -4,7 +4,7 @@ ACE_INLINE void CORBA::release (CORBA_ServerRequest *req) { if (req) - req->Release (); + req->_decr_refcnt (); } ACE_INLINE TAO_InputCDR & diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 5f422c10dd5..31f17ac4b8a 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -179,7 +179,7 @@ struct TAO_Skel_Entry // skeleton corresponding to the operation }; -class TAO_Export STUB_Object : public TAO_IUnknown +class TAO_Export STUB_Object { // = TITLE // STUB_Object @@ -273,6 +273,10 @@ public: // Return the object key as an out parameter. Caller should release // return value when finished with it. + // = Memory management. + virtual CORBA::ULong _incr_refcnt (void) = 0; + virtual CORBA::ULong _decr_refcnt (void) = 0; + protected: virtual ~STUB_Object (void); // XXX virtual inlines are evil. diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 764a2b539a7..642798a1040 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -23,7 +23,7 @@ CORBA::TypeCode_ptr CORBA_TypeCode::_duplicate (CORBA::TypeCode_ptr tc) { if (tc) - tc->AddRef (); + tc->_incr_refcnt (); return tc; } @@ -211,7 +211,7 @@ CORBA_TypeCode::~CORBA_TypeCode (void) void CORBA::release (CORBA::TypeCode_ptr tc) { if (tc) - tc->Release (); + tc->_decr_refcnt (); } // returns true if the typecode is NULL @@ -585,7 +585,7 @@ TC_Private_State::~TC_Private_State (void) } CORBA::ULong -CORBA_TypeCode::AddRef (void) +CORBA_TypeCode::_incr_refcnt (void) { assert (this != 0); @@ -600,7 +600,7 @@ CORBA_TypeCode::AddRef (void) } CORBA::ULong -CORBA_TypeCode::Release (void) +CORBA_TypeCode::_decr_refcnt (void) { ACE_ASSERT (this != 0); @@ -609,7 +609,7 @@ CORBA_TypeCode::Release (void) if (this->orb_owns_) result = this->refcount_; // 1 else if (this->parent_) - // return parent_->Release (); + // return parent_->_decr_refcnt (); result = this->refcount_; // 1 else { @@ -2226,7 +2226,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, else if (!stream.read_ulong (temp) // default used || !stream.read_ulong (temp)) // member count { - tc->Release (); + tc->_decr_refcnt (); env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); return 0; } @@ -2246,7 +2246,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, || !stream.skip_string () // member name || !skip_typecode (stream)) { // member typecode - tc->Release (); + tc->_decr_refcnt (); env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); return 0; } @@ -2257,11 +2257,11 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, env) != CORBA::TypeCode::TRAVERSE_CONTINUE || !stream.skip_string ()) // member name { - tc->Release (); + tc->_decr_refcnt (); env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); return 0; } - tc->Release (); + tc->_decr_refcnt (); if (stream.decode (CORBA::_tc_TypeCode, &tc, this, diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h index fd41b78f21d..457b7c87781 100644 --- a/TAO/tao/Typecode.h +++ b/TAO/tao/Typecode.h @@ -170,8 +170,8 @@ public: // returns the alignment requirements for this typecode. used by the // IIOP marshaling engine. - CORBA::ULong AddRef (void); - CORBA::ULong Release (void); + CORBA::ULong _incr_refcnt (void); + CORBA::ULong _decr_refcnt (void); // = Following three are deprecated diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index a86d81a6eba..58da462297c 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -654,7 +654,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, retval = dest->append (tc2, src, env); } - // tc2->Release (); + // tc2->_decr_refcnt (); if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE && continue_append == CORBA::B_TRUE) return CORBA::TypeCode::TRAVERSE_CONTINUE; diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 22bfb3d151e..381f80f5f67 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -70,10 +70,6 @@ # define TAO_SINGLETON_DECLARATION(T) #endif /* TAO_HAS_DLL */ -// COM stuff -#include "tao/compat/objbase.h" -// #include "tao/compat/initguid.h" - // For some reason, PC compilers don't implement "natural" alignment, // but only use fixed alignment policies. The following #pragmas // configure fixed one-byte alignment policy, since some fixed policy diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index 120fb2eef9e..290fba2d004 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -178,7 +178,7 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr, { any->any_owns_data_ = 1; any->value_ = 0; - elem_tc->AddRef (); + elem_tc->_incr_refcnt (); any->type_ = elem_tc; // now skip the value // retval = stream->skip (elem_tc, env); @@ -630,7 +630,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, profile->iiop_version.major, profile->iiop_version.minor)); objdata->type_id = (const char *) 0; - objdata->Release (); + objdata->_decr_refcnt (); objdata = 0; continue; } @@ -644,7 +644,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, { env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); ACE_DEBUG ((LM_DEBUG, "error decoding IIOP host/port")); - objdata->Release (); + objdata->_decr_refcnt (); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -663,7 +663,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, "%d bytes out of %d left after IIOP profile data\n", str.length (), encap_len)); - objdata->Release (); + objdata->_decr_refcnt (); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -694,7 +694,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, // the corba proxy would have already incremented the reference count on // the objdata. So we decrement it here by 1 so that the objdata is now // fully owned by the corba_proxy that was created. - objdata->Release (); + objdata->_decr_refcnt (); } if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE && continue_decoding == CORBA::B_TRUE) @@ -1500,7 +1500,7 @@ TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr tc, retval = CORBA::TypeCode::TRAVERSE_STOP; } } - // tc2->Release (); + // tc2->_decr_refcnt (); if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE && continue_decoding == CORBA::B_TRUE) return CORBA::TypeCode::TRAVERSE_CONTINUE; diff --git a/TAO/tao/deep_copy.cpp b/TAO/tao/deep_copy.cpp index d69daafc744..ed3d26222dd 100644 --- a/TAO/tao/deep_copy.cpp +++ b/TAO/tao/deep_copy.cpp @@ -1123,7 +1123,7 @@ TAO_Marshal_Except::deep_copy (CORBA::TypeCode_ptr tc, // exception ID. We just copy that typecode. *(CORBA::TypeCode_ptr *) dest = *(CORBA::TypeCode_ptr *) source; - (void) (*(CORBA::TypeCode_ptr *) dest)->AddRef (); + (void) (*(CORBA::TypeCode_ptr *) dest)->_incr_refcnt (); // compute the number of fields in the struct int member_count = tc->member_count (env); diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index 116763c3891..df7ebdae3f3 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -280,20 +280,13 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr, // // For now, the original code is minimally changed. - IIOP_Object *objdata; - IIOP::Profile *profile; + IIOP_Object *iiopobj = + ACE_dynamic_cast (IIOP_Object*, obj->_stubobj ()); - if (obj->QueryInterface (IID_IIOP_Object, (void **) &objdata) - != TAO_NOERROR) - { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); - return CORBA::TypeCode::TRAVERSE_STOP; - } - obj->Release (); - profile = &objdata->profile; + IIOP::Profile *profile = &iiopobj->profile; // STRING, a type ID hint - stream->encode (CORBA::_tc_string, &objdata->type_id, 0, env); + stream->encode (CORBA::_tc_string, &iiopobj->type_id, 0, env); // UNSIGNED LONG, value one, count of the sequence of // encapsulated protocol profiles; @@ -1132,7 +1125,7 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc, retval = CORBA::TypeCode::TRAVERSE_STOP; } } - // tc2->Release (); + // tc2->_decr_refcnt (); if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE && continue_encoding == CORBA::B_TRUE) return CORBA::TypeCode::TRAVERSE_CONTINUE; diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 18e6eec54b7..cab32880cc1 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -693,7 +693,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, { retval = stream->skip (tc2, env); } - // tc2->Release (); + // tc2->_decr_refcnt (); if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE && continue_skipping == CORBA::B_TRUE) return CORBA::TypeCode::TRAVERSE_CONTINUE; diff --git a/TAO/taoconfig.mk b/TAO/taoconfig.mk index 424d36476ef..ebe37db01c4 100644 --- a/TAO/taoconfig.mk +++ b/TAO/taoconfig.mk @@ -10,5 +10,4 @@ TAO_ROOT = $(ACE_ROOT)/TAO endif LDFLAGS := $(patsubst -L$(ACE_ROOT)/ace, -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace, $(LDFLAGS)) -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H - +CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG) diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile index 1566b659043..af37c30a3f3 100644 --- a/TAO/tests/CDR/Makefile +++ b/TAO/tests/CDR/Makefile @@ -43,7 +43,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG) basic_types: $(addprefix $(VDIR),$(BASIC_TYPES_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -206,7 +206,6 @@ clean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -428,7 +427,6 @@ clean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -652,7 +650,6 @@ clean: $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile index 9aa308d2963..af67c6530bb 100644 --- a/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile +++ b/TAO/tests/Cubit/TAO/IDL_Cubit/Makefile @@ -243,7 +243,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -466,7 +465,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -690,7 +688,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -931,7 +928,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1024,7 +1020,9 @@ realclean: clean $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.i \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS_T.cpp \ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h + $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \ + $(TAO_ROOT)/tao/Timeprobe.h \ + $(ACE_ROOT)/ace/Timeprobe.h .obj/client_i.o .obj/client_i.so .shobj/client_i.o .shobj/client_i.so: client_i.cpp \ $(ACE_ROOT)/ace/Env_Value_T.h \ $(ACE_ROOT)/ace/OS.h \ @@ -1180,7 +1178,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1412,7 +1409,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1657,7 +1653,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1733,7 +1728,9 @@ realclean: clean $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ - cubitC.h cubitC.i + cubitC.h cubitC.i \ + $(TAO_ROOT)/tao/Timeprobe.h \ + $(ACE_ROOT)/ace/Timeprobe.h .obj/cubit_i.o .obj/cubit_i.so .shobj/cubit_i.o .shobj/cubit_i.so: cubit_i.cpp \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -1880,7 +1877,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2109,7 +2105,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp b/TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp index 4b131da7d12..67f4710adb7 100644 --- a/TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp +++ b/TAO/tests/Cubit/TAO/IDL_Cubit/client_i.cpp @@ -853,7 +853,7 @@ Cubit_Client::~Cubit_Client (void) CORBA::release (this->cubit_); if (this->cubit_factory_key_ != 0) - ACE_OS::free (this->cubit_factory_key_); + delete[] (this->cubit_factory_key_); if (this->cubit_key_ != 0) ACE_OS::free (this->cubit_key_); } diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/tests/Cubit/TAO/MT_Cubit/Makefile index f3b536fde73..37465ab520f 100644 --- a/TAO/tests/Cubit/TAO/MT_Cubit/Makefile +++ b/TAO/tests/Cubit/TAO/MT_Cubit/Makefile @@ -64,7 +64,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU #CXX := purify $(CXX) LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/tao/compat +CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs # pccTimer will eventually get integrated into ACE. It is specific for ClassiX on VME ifdef CHORUS @@ -244,7 +244,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -467,7 +466,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -695,7 +693,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -926,7 +923,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1170,7 +1166,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1399,7 +1394,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1641,7 +1635,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1866,7 +1859,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/Demux_Test/Makefile b/TAO/tests/Demux_Test/Makefile index 81821f77342..85ce98899c4 100755 --- a/TAO/tests/Demux_Test/Makefile +++ b/TAO/tests/Demux_Test/Makefile @@ -43,7 +43,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU LDFLAGS += -lTAO LDFLAGS += -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat +CPPFLAGS += -I$(TAO_ROOT) ifdef quantify LDFLAGS += -L/pkg/purify/quantify-2.1-solaris2/ -lquantify_stubs diff --git a/TAO/tests/NestedUpcall/Reactor/Makefile b/TAO/tests/NestedUpcall/Reactor/Makefile index 22955092b67..a8c4e69c9eb 100644 --- a/TAO/tests/NestedUpcall/Reactor/Makefile +++ b/TAO/tests/NestedUpcall/Reactor/Makefile @@ -210,7 +210,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -434,7 +433,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -658,7 +656,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -907,7 +904,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile index 4c047d4f026..e4c27d6be61 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile +++ b/TAO/tests/NestedUpcall/Triangle_Test/Makefile @@ -219,7 +219,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -443,7 +442,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -668,7 +666,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -894,7 +891,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1119,7 +1115,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1344,7 +1339,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1569,7 +1563,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1797,7 +1790,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile index 142042a7159..bbcfbb4b3e2 100644 --- a/TAO/tests/OctetSeq/Makefile +++ b/TAO/tests/OctetSeq/Makefile @@ -42,7 +42,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG) OctetSeq: $(addprefix $(VDIR),$(OCTETSEQ_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) @@ -206,7 +206,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -429,7 +428,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -652,7 +650,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/POA/Default_Servant/Makefile b/TAO/tests/POA/Default_Servant/Makefile index c25f93e73b4..38aecb4f5d0 100644 --- a/TAO/tests/POA/Default_Servant/Makefile +++ b/TAO/tests/POA/Default_Servant/Makefile @@ -201,7 +201,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -424,7 +423,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -648,7 +646,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -871,7 +868,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1094,7 +1090,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/POA/Explicit_Activation/Makefile b/TAO/tests/POA/Explicit_Activation/Makefile index 78855793479..2c4f4182b18 100644 --- a/TAO/tests/POA/Explicit_Activation/Makefile +++ b/TAO/tests/POA/Explicit_Activation/Makefile @@ -189,7 +189,6 @@ endif $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/POA/FindPOA/Makefile b/TAO/tests/POA/FindPOA/Makefile index a2669bc1f61..af85eb7f324 100644 --- a/TAO/tests/POA/FindPOA/Makefile +++ b/TAO/tests/POA/FindPOA/Makefile @@ -186,7 +186,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/POA/Forwarding/Makefile b/TAO/tests/POA/Forwarding/Makefile index e146c2c32de..06c26dffaac 100644 --- a/TAO/tests/POA/Forwarding/Makefile +++ b/TAO/tests/POA/Forwarding/Makefile @@ -170,8 +170,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -202,8 +204,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -213,22 +213,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -258,6 +248,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -266,6 +258,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -273,6 +274,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -389,8 +392,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -421,8 +426,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -432,22 +435,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -477,6 +470,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -485,6 +480,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -492,6 +496,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -608,8 +614,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -640,8 +648,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -651,22 +657,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -696,6 +692,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -704,6 +702,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -711,6 +718,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -830,8 +839,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -862,8 +873,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -873,22 +882,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -918,6 +917,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -926,6 +927,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -933,12 +943,14 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ $(ACE_ROOT)/ace/Read_Buffer.h \ - $(ACE_ROOT)/ace/Read_Buffer.i \ - FooC.h FooC.i + $(ACE_ROOT)/ace/Read_Buffer.i FooC.h \ + FooC.i .obj/MyFooServant.o .obj/MyFooServant.so .shobj/MyFooServant.o .shobj/MyFooServant.so: MyFooServant.cpp \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ @@ -1051,8 +1063,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -1083,8 +1097,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1094,22 +1106,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1139,6 +1141,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1147,6 +1151,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1154,6 +1167,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ @@ -1271,8 +1286,10 @@ realclean: clean $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ $(ACE_ROOT)/ace/Message_Queue.i \ - $(ACE_ROOT)/ace/Message_Queue.cpp \ $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ @@ -1303,8 +1320,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1314,22 +1329,12 @@ realclean: clean $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -1359,6 +1364,8 @@ realclean: clean $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ @@ -1367,6 +1374,15 @@ realclean: clean $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -1374,6 +1390,8 @@ realclean: clean $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h \ diff --git a/TAO/tests/POA/Generic_Servant/Makefile b/TAO/tests/POA/Generic_Servant/Makefile index 7bfb6db1c77..04d5e540d38 100644 --- a/TAO/tests/POA/Generic_Servant/Makefile +++ b/TAO/tests/POA/Generic_Servant/Makefile @@ -218,7 +218,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -442,7 +441,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -665,7 +663,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/POA/Makefile b/TAO/tests/POA/Makefile index eebf7e25487..afcb83cb7ad 100644 --- a/TAO/tests/POA/Makefile +++ b/TAO/tests/POA/Makefile @@ -16,7 +16,8 @@ DIRS = Generic_Servant \ FindPOA \ NewPOA \ On_Demand_Activation \ - RootPOA + RootPOA \ + locking \ # The following test hasn't been updated yet # Demux_Test diff --git a/TAO/tests/POA/NewPOA/Makefile b/TAO/tests/POA/NewPOA/Makefile index 01df6509e3e..40fbb5f848d 100644 --- a/TAO/tests/POA/NewPOA/Makefile +++ b/TAO/tests/POA/NewPOA/Makefile @@ -186,7 +186,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/POA/On_Demand_Activation/Makefile b/TAO/tests/POA/On_Demand_Activation/Makefile index 59e00887676..69e2688ac69 100644 --- a/TAO/tests/POA/On_Demand_Activation/Makefile +++ b/TAO/tests/POA/On_Demand_Activation/Makefile @@ -189,7 +189,6 @@ endif $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -416,7 +415,6 @@ endif $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/POA/RootPOA/Makefile b/TAO/tests/POA/RootPOA/Makefile index 6c160232b43..f8c981e7dee 100644 --- a/TAO/tests/POA/RootPOA/Makefile +++ b/TAO/tests/POA/RootPOA/Makefile @@ -185,7 +185,6 @@ endif $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/POA/locking/Makefile b/TAO/tests/POA/locking/Makefile index 572beb3946e..be4c372d9b0 100644 --- a/TAO/tests/POA/locking/Makefile +++ b/TAO/tests/POA/locking/Makefile @@ -44,6 +44,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/streams.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ + $(ACE_ROOT)/ace/config-sunos5.5.h \ + $(ACE_ROOT)/ace/config-g++-common.h \ $(TAO_ROOT)/tao/corba.h \ $(TAO_ROOT)/tao/orbconf.h \ $(ACE_ROOT)/ace/OS.h \ @@ -84,39 +86,39 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Thread.h \ $(ACE_ROOT)/ace/Thread.i \ $(ACE_ROOT)/ace/Atomic_Op.i \ + $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Signal.h \ + $(ACE_ROOT)/ace/Containers.h \ + $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Containers.cpp \ $(ACE_ROOT)/ace/Malloc.h \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ $(ACE_ROOT)/ace/Free_List.i \ + $(ACE_ROOT)/ace/Free_List.cpp \ $(ACE_ROOT)/ace/Malloc_T.i \ + $(ACE_ROOT)/ace/Malloc_T.cpp \ $(ACE_ROOT)/ace/Memory_Pool.h \ - $(ACE_ROOT)/ace/Signal.h \ - $(ACE_ROOT)/ace/Containers.h \ - $(ACE_ROOT)/ace/Containers.i \ + $(ACE_ROOT)/ace/Mem_Map.h \ + $(ACE_ROOT)/ace/Mem_Map.i \ + $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Signal.i \ $(ACE_ROOT)/ace/Object_Manager.h \ $(ACE_ROOT)/ace/Object_Manager.i \ $(ACE_ROOT)/ace/Managed_Object.h \ $(ACE_ROOT)/ace/Managed_Object.i \ - $(ACE_ROOT)/ace/Mem_Map.h \ - $(ACE_ROOT)/ace/Mem_Map.i \ - $(ACE_ROOT)/ace/Memory_Pool.i \ - $(ACE_ROOT)/ace/SOCK_Acceptor.h \ - $(ACE_ROOT)/ace/Time_Value.h \ - $(ACE_ROOT)/ace/SOCK_Acceptor.i \ - $(ACE_ROOT)/ace/SOCK_Connector.h \ - $(ACE_ROOT)/ace/SOCK_Connector.i \ - $(ACE_ROOT)/ace/Strategies.h \ - $(ACE_ROOT)/ace/Strategies_T.h \ - $(ACE_ROOT)/ace/Service_Config.h \ - $(ACE_ROOT)/ace/Service_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.h \ - $(ACE_ROOT)/ace/Shared_Object.i \ - $(ACE_ROOT)/ace/Service_Object.i \ + $(ACE_ROOT)/ace/Managed_Object.cpp \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Service_Config.i \ $(ACE_ROOT)/ace/Reactor.h \ $(ACE_ROOT)/ace/Handle_Set.h \ @@ -124,61 +126,81 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(ACE_ROOT)/ace/Timer_Queue.h \ $(ACE_ROOT)/ace/Timer_Queue_T.h \ $(ACE_ROOT)/ace/Timer_Queue_T.i \ + $(ACE_ROOT)/ace/Timer_Queue_T.cpp \ $(ACE_ROOT)/ace/Reactor.i \ $(ACE_ROOT)/ace/Reactor_Impl.h \ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.h \ + $(ACE_ROOT)/ace/Time_Value.h \ + $(ACE_ROOT)/ace/SOCK_Acceptor.i \ + $(ACE_ROOT)/ace/SOCK_Connector.h \ + $(ACE_ROOT)/ace/SOCK_Connector.i \ + $(ACE_ROOT)/ace/Strategies.h \ + $(ACE_ROOT)/ace/Strategies_T.h \ $(ACE_ROOT)/ace/Synch_Options.h \ $(ACE_ROOT)/ace/Synch_Options.i \ $(ACE_ROOT)/ace/Strategies_T.i \ + $(ACE_ROOT)/ace/Strategies_T.cpp \ + $(ACE_ROOT)/ace/Service_Repository.h \ + $(ACE_ROOT)/ace/Service_Types.h \ + $(ACE_ROOT)/ace/Service_Types.i \ + $(ACE_ROOT)/ace/Service_Repository.i \ + $(ACE_ROOT)/ace/Thread_Manager.h \ + $(ACE_ROOT)/ace/Thread_Manager.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.h \ + $(ACE_ROOT)/ace/Message_Queue.h \ + $(ACE_ROOT)/ace/Message_Block.h \ + $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ + $(ACE_ROOT)/ace/Message_Queue_T.h \ + $(ACE_ROOT)/ace/Message_Queue_T.i \ + $(ACE_ROOT)/ace/Message_Queue_T.cpp \ + $(ACE_ROOT)/ace/Message_Queue.i \ + $(ACE_ROOT)/ace/WFMO_Reactor.i \ $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Connector.h \ $(ACE_ROOT)/ace/Map_Manager.h \ $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ $(ACE_ROOT)/ace/Svc_Handler.h \ $(ACE_ROOT)/ace/Task.h \ - $(ACE_ROOT)/ace/Thread_Manager.h \ - $(ACE_ROOT)/ace/Thread_Manager.i \ $(ACE_ROOT)/ace/Task.i \ $(ACE_ROOT)/ace/Task_T.h \ - $(ACE_ROOT)/ace/Message_Queue.h \ - $(ACE_ROOT)/ace/Message_Block.h \ - $(ACE_ROOT)/ace/Message_Block.i \ - $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ - $(ACE_ROOT)/ace/Message_Queue.i \ $(ACE_ROOT)/ace/Task_T.i \ + $(ACE_ROOT)/ace/Task_T.cpp \ + $(ACE_ROOT)/ace/Module.h \ + $(ACE_ROOT)/ace/Module.i \ + $(ACE_ROOT)/ace/Module.cpp \ + $(ACE_ROOT)/ace/Stream_Modules.h \ + $(ACE_ROOT)/ace/Stream_Modules.i \ + $(ACE_ROOT)/ace/Stream_Modules.cpp \ $(ACE_ROOT)/ace/Dynamic.h \ $(ACE_ROOT)/ace/Dynamic.i \ $(ACE_ROOT)/ace/Singleton.h \ $(ACE_ROOT)/ace/Singleton.i \ + $(ACE_ROOT)/ace/Singleton.cpp \ $(ACE_ROOT)/ace/Svc_Handler.i \ + $(ACE_ROOT)/ace/Svc_Handler.cpp \ $(ACE_ROOT)/ace/Connector.i \ + $(ACE_ROOT)/ace/Connector.cpp \ $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ - $(TAO_ROOT)/tao/compat/objbase.h \ - $(TAO_ROOT)/tao/compat/initguid.h \ + $(ACE_ROOT)/ace/Acceptor.cpp \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ $(TAO_ROOT)/tao/Sequence.i \ $(TAO_ROOT)/tao/Sequence_T.h \ $(TAO_ROOT)/tao/Sequence_T.i \ + $(TAO_ROOT)/tao/Sequence_T.cpp \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ + $(TAO_ROOT)/tao/Union.h \ $(TAO_ROOT)/tao/ORB.i \ $(TAO_ROOT)/tao/Exception.h \ $(TAO_ROOT)/tao/Exception.i \ $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ - $(TAO_ROOT)/tao/params.h \ - $(TAO_ROOT)/tao/params.i \ - $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ - $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ - $(TAO_ROOT)/tao/default_client.h \ - $(TAO_ROOT)/tao/default_client.i \ - $(TAO_ROOT)/tao/default_server.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.h \ - $(TAO_ROOT)/tao/ORB_Strategies_T.i \ - $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/NVList.h \ $(TAO_ROOT)/tao/NVList.i \ $(TAO_ROOT)/tao/Principal.h \ @@ -208,13 +230,25 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(TAO_ROOT)/tao/Object_Table.h \ $(TAO_ROOT)/tao/POA.i \ $(TAO_ROOT)/tao/poa_macros.h \ + $(TAO_ROOT)/tao/params.h \ + $(TAO_ROOT)/tao/params.i \ $(TAO_ROOT)/tao/Connect.h \ $(TAO_ROOT)/tao/Connect.i \ $(TAO_ROOT)/tao/ORB_Core.h \ $(TAO_ROOT)/tao/ORB_Core.i \ $(ACE_ROOT)/ace/Dynamic_Service.h \ + $(ACE_ROOT)/ace/Dynamic_Service.cpp \ $(TAO_ROOT)/tao/Operation_Table.h \ $(TAO_ROOT)/tao/debug.h \ + $(TAO_ROOT)/tao/Client_Strategy_Factory.h \ + $(TAO_ROOT)/tao/Server_Strategy_Factory.h \ + $(TAO_ROOT)/tao/default_client.h \ + $(TAO_ROOT)/tao/default_client.i \ + $(TAO_ROOT)/tao/default_server.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.h \ + $(TAO_ROOT)/tao/ORB_Strategies_T.i \ + $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \ + $(TAO_ROOT)/tao/default_server.i \ $(TAO_ROOT)/tao/IIOP_Object.h \ $(TAO_ROOT)/tao/IIOP_Object.i \ $(TAO_ROOT)/tao/IIOP_ORB.h \ @@ -222,6 +256,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU $(TAO_ROOT)/tao/IIOP_Interpreter.h \ $(TAO_ROOT)/tao/GIOP.h \ $(TAO_ROOT)/tao/GIOP.i \ + $(TAO_ROOT)/tao/Invocation.h \ + $(TAO_ROOT)/tao/Invocation.i \ $(TAO_ROOT)/tao/Server_Request.h \ $(TAO_ROOT)/tao/Server_Request.i \ $(TAO_ROOT)/tao/singletons.h diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile index c670732a423..c3328ef8c66 100644 --- a/TAO/tests/Param_Test/Makefile +++ b/TAO/tests/Param_Test/Makefile @@ -80,7 +80,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H +CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG) .PRECIOUS: $(IDL_HDR) $(IDL_SRC) #$(IDL_HDR) $(IDL_SRC): param_test.idl @@ -247,7 +247,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -471,7 +470,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -696,7 +694,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -920,7 +917,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1144,7 +1140,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1367,7 +1362,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1591,7 +1585,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1815,7 +1808,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2048,7 +2040,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2276,7 +2267,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2502,7 +2492,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2724,7 +2713,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2947,7 +2935,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3170,7 +3157,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3393,7 +3379,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3616,7 +3601,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -3839,7 +3823,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4062,7 +4045,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4285,7 +4267,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4508,7 +4489,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4731,7 +4711,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -4954,7 +4933,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5177,7 +5155,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5400,7 +5377,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5623,7 +5599,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -5846,7 +5821,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6069,7 +6043,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6292,7 +6265,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6515,7 +6487,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6738,7 +6709,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -6961,7 +6931,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7184,7 +7153,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7407,7 +7375,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -7630,7 +7597,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/Quoter/Makefile b/TAO/tests/Quoter/Makefile index f3a855ff1ab..b1541314835 100644 --- a/TAO/tests/Quoter/Makefile +++ b/TAO/tests/Quoter/Makefile @@ -75,7 +75,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/orbsvcs/orbsvcs \ - -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat $(TSS_ORB_FLAG)#-H + -I$(TAO_ROOT) $(TSS_ORB_FLAG) realclean: clean -/bin/rm -rf QuoterC.* QuoterS.* QuoterS_T.* @@ -251,7 +251,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -492,7 +491,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -731,7 +729,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -960,7 +957,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1207,7 +1203,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1446,7 +1441,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1687,7 +1681,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1926,7 +1919,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -2169,7 +2161,6 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS)) $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ diff --git a/TAO/tests/Thruput/TAO/Makefile b/TAO/tests/Thruput/TAO/Makefile index 15bf5ceba64..f5b39c47ab2 100644 --- a/TAO/tests/Thruput/TAO/Makefile +++ b/TAO/tests/Thruput/TAO/Makefile @@ -49,7 +49,7 @@ include $(TAO_ROOT)/taoconfig.mk #---------------------------------------------------------------------------- LDFLAGS += -L$(TAO_ROOT)/tao -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat +CPPFLAGS += -I$(TAO_ROOT) $(IDL_SRC): ttcp.idl $(TAO_ROOT)/TAO_IDL/tao_idl ttcp.idl @@ -211,7 +211,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -434,7 +433,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -657,7 +655,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -885,7 +882,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1113,7 +1109,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1336,7 +1331,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ @@ -1563,7 +1557,6 @@ realclean: clean $(ACE_ROOT)/ace/Acceptor.h \ $(ACE_ROOT)/ace/Acceptor.i \ $(ACE_ROOT)/ace/Acceptor.cpp \ - $(TAO_ROOT)/tao/compat/objbase.h \ $(TAO_ROOT)/tao/Align.h \ $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Sequence.h \ |