diff options
31 files changed, 442 insertions, 763 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 048ad406065..80220078263 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,11 +1,73 @@ +Fri Nov 17 10:11:17 2000 Carlos O'Ryan <coryan@uci.edu> + + * tao/corba.h: + * TAO_IDL/be/be_codegen.cpp: + Removed reference to the PortableServer library in the corba.h + file. Only the generated skeletons need the ServerRequestInfo.h + file, so we generate an explicit #include, instead of taxing the + whole world with the extra file. + + * orbsvcs/TAO_Service/TAO_Service.cpp: + Fixed warning + + * orbsvcs/tests/FaultTolerance/IOGR/Makefile: + * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile: + Disable if the right components are not in + + * orbsvcs/tests/LoadBalancing/Makefile: + Disable if the right components are not in + + * orbsvcs/tests/LoadBalancing/Hash_Replica_i.h: + * orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp: + Fixed warnings and errors due to exception handling stuff. + + * orbsvcs/tests/ior_corbaname/status_i.h: + * orbsvcs/tests/ior_corbaname/status_i.cpp: + * orbsvcs/tests/ior_corbaname/client.cpp: + Fixed warnings. + + * orbsvcs/tests/tests_svc_loader/Makefile: + * orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp: + + * tao/Asynch_Invocation.h: + * tao/Asynch_Invocation.cpp: + Some of the code was not compiled under minimum corba, but was + used anyway if other variables were set. Don't use it under + minimum CORBA either. + + * tao/CORBALOC_Parser.h: + * tao/CORBALOC_Parser.cpp: + * tao/CORBANAME_Parser.h: + * tao/CORBANAME_Parser.cpp: + * tao/ior_corbaloc_export.h: + * tao/ior_corbaname_export.h: + Fixed excessive #includes. + Remove obsolete #includes + + * tao/Makefile: + * tao/Remote_Object_Proxy_Impl.cpp: + Never include "corba.h" directly in the tao library, it + introduces deadly cyclic dependencies. + + * tao/DynamicAny/Makefile: + * tao/DynamicInterface/Makefile: + * tao/IORManipulation/Makefile: + * tao/IORTable/Makefile: + * tao/PortableServer/Makefile: + * tao/Strategies/Makefile: + Update dependencies due to the removed files. + + * tests/ior_corbaloc/ior_corbaloc_client_i.cpp: + Fixed warnings. + Fri Nov 17 10:59:09 2000 Jeff Parsons <parsons@cs.wustl.edu> - * tao/DynamicInterface/DynamicImplementation.cpp: - * tao/DynamicInterface/Server_Request.cpp: + * tao/DynamicInterface/DynamicImplementation.cpp: + * tao/DynamicInterface/Server_Request.cpp: - Fixed DSI exception handling. Thanks to - Mateu Batle <mbatle@iname.com> for reporting this - bug. + Fixed DSI exception handling. Thanks to + Mateu Batle <mbatle@iname.com> for reporting this + bug. Fri Nov 17 08:23:03 2000 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 812b008e371..b2c7e000e98 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -584,6 +584,7 @@ TAO_CodeGen::start_server_header (const char *fname) << "#include \"tao/PortableServer/PortableServer.h\"\n" << "#include \"tao/PortableServer/Servant_Base.h\"\n" << "#include \"tao/PortableServer/Collocated_Object.h\"\n" + << "#include \"tao/PortableServer/ServerRequestInfo.h\"\n" << "\n"; *this->server_header_ << "#if defined(_MSC_VER)\n" diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp index 450826e0b67..a130b67f987 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp @@ -46,7 +46,8 @@ main (int argc, ACE_TCHAR *argv[]) { ACE_Time_Value tv (5, 0); - orb->perform_work (tv); + orb->perform_work (tv, ACE_TRY_ENV); + ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Reconfig flag = %d\n", @@ -64,5 +65,4 @@ main (int argc, ACE_TCHAR *argv[]) } ACE_ENDTRY; return 0; - } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile index c72b2d1dad2..89784c70412 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile @@ -15,9 +15,9 @@ endif # ! TAO_ROOT #LDLIBS = -lTAO_FaultTolerance -lTAO -lACE IDLFILES = testC testS -BIN = server Manager +BIN_UNCHECKED = server Manager -SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i) +SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) $(IDLFILES) test_i) SERVER_OBJS = server.o test_i.o $(addsuffix .o, $(IDLFILES)) MANAGER_OBJS = Manager.o testC.o @@ -31,6 +31,12 @@ TAO_IDLFLAGS += -Ge 1 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (FaultTolerance,$(findstring FaultTolerance,$(TAO_ORBSVCS))) + BIN = $(BIN_UNCHECKED) +endif # FaultTolerance + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile index 4d12439881e..c5d796d999c 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile @@ -21,11 +21,7 @@ SRC = $(PROG_SRCS) SIMPLE_CLT_OBJS = IOGRTest.o SIMPLE_SVR_OBJS = -BIN2 = IOGRTest - -#### If the TAO orbsvcs library wasn't built with sufficient components, -#### don't try to build here. - BIN = $(BIN2) +BIN_UNCHECKED = IOGRTest #---------------------------------------------------------------------------- # Include macros and targets @@ -34,6 +30,12 @@ BIN2 = IOGRTest include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (FaultTolerance,$(findstring FaultTolerance,$(TAO_ORBSVCS))) + BIN = $(BIN_UNCHECKED) +endif # FaultTolerance + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp index 92aef8acdaa..392cf3d91f9 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.cpp @@ -16,8 +16,7 @@ Hash_Replica_Impl::Hash_Replica_Impl (Hash_ReplicaControl *control) CORBA::ULong Hash_Replica_Impl::do_hash (const char *str, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->reject_requests_) { diff --git a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h index 75737c5af66..fd7dff9fc35 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h +++ b/TAO/orbsvcs/tests/LoadBalancing/Hash_Replica_i.h @@ -29,8 +29,7 @@ public: virtual CORBA::ULong do_hash (const char * str, CORBA::Environment &ACE_TRY_ENV) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + ACE_THROW_SPEC ((CORBA::SystemException)); // Perform a simple hashing operation on the input string <str> and // return the hashed string <hash_str>. diff --git a/TAO/orbsvcs/tests/LoadBalancing/Makefile b/TAO/orbsvcs/tests/LoadBalancing/Makefile index 8caece2700a..4606dd53eec 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/Makefile +++ b/TAO/orbsvcs/tests/LoadBalancing/Makefile @@ -12,12 +12,12 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_LoadBalancing -lTAO +LDLIBS = -lTAO_LoadBalancing -lTAO_PortableServer -lTAO IDLFILES = Hash_ReplicaC Hash_ReplicaS -BIN = client server +BIN_UNCHECKED = client server -SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) Hash_ReplicaControl Hash_Replica_i) +SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) $(IDLFILES) Hash_ReplicaControl Hash_Replica_i) CLIENT_OBJS = client.o Hash_ReplicaC.o SERVER_OBJS = server.o Hash_ReplicaControl.o Hash_Replica_i.o $(addsuffix .o, $(IDLFILES)) @@ -31,6 +31,12 @@ TAO_IDLFLAGS += -Ge 1 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU + +TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) +ifeq (LoadBalancing,$(findstring LoadBalancing,$(TAO_ORBSVCS))) + BIN = $(BIN_UNCHECKED) +endif # LoadBalancing + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU diff --git a/TAO/orbsvcs/tests/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp index 2c4a30a83f5..74a390490d7 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp @@ -27,7 +27,6 @@ int main (int argc, char *argv []) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - IOR_corbaname_Client_i client; if (client.init (argc, argv) == -1) @@ -41,8 +40,7 @@ int main (int argc, char *argv []) ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "client"); - ACE_RE_THROW; } ACE_ENDTRY; - return 0; + return 1; } diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp index ed924dd9956..46de9181071 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp @@ -4,14 +4,14 @@ #include "status_i.h" -corbaname_Status_i::corbaname_Status_i (CORBA::Environment & = TAO_default_environment()) +corbaname_Status_i::corbaname_Status_i (CORBA::Environment &) { // Constructor } CORBA::Boolean -corbaname_Status_i::print_status (CORBA::Environment & = TAO_default_environment()) - throw (CORBA::SystemException) +corbaname_Status_i::print_status (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { // If the client makes a succesful request, return a true value // indicating that it has successfully reached the server. diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h index 4ffbf10bd5d..99ded5c7143 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h @@ -13,9 +13,9 @@ public: corbaname_Status_i (CORBA::Environment & = TAO_default_environment()); - CORBA::Boolean print_status (CORBA::Environment & = TAO_default_environment()) - throw (CORBA::SystemException); - + CORBA::Boolean print_status (CORBA::Environment & = TAO_default_environment()) + ACE_THROW_SPEC ((CORBA::SystemException)); + }; #endif /* STATUS_I_H */ diff --git a/TAO/orbsvcs/tests/tests_svc_loader/Makefile b/TAO/orbsvcs/tests/tests_svc_loader/Makefile index c745c2e223f..ce0821a0f09 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/Makefile +++ b/TAO/orbsvcs/tests/tests_svc_loader/Makefile @@ -15,20 +15,20 @@ endif LDLIBS = -lTAO ACE_SHLIBS = -lTAO -lACE -PROG_SRCS = tests_svc_loader.cpp \ +PROG_SRCS = tests_svc_loader.cpp SRC = $(PROG_SRCS) -SIMPLE_CLI_OBJS = tests_svc_loader.o \ +SIMPLE_CLI_OBJS = tests_svc_loader.o BIN2 = tests_svc_loader #### If the TAO orbsvcs library wasn't built with sufficient components, #### don't try to build here. TAO_ORBSVCS := $(shell sh $(ACE_ROOT)/bin/ace_components --orbsvcs) -ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS))) +ifneq (minimum_corba,1) BIN = $(BIN2) -endif # Naming +endif # minimum_corba TAO_IDLFLAGS += -Ge 1 #---------------------------------------------------------------------------- @@ -58,9 +58,6 @@ tests_svc_loader: $(addprefix $(VDIR),$(SIMPLE_CLI_OBJS)) $(SHLIB) $(BIN): -realclean: clean - -$(RM) $(foreach ext, $(IDL_EXT), Time_Date$(ext)) - #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp index 186f224b3d8..60b7eb6572e 100644 --- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp +++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp @@ -22,12 +22,10 @@ // // ============================================================================ -#include <iostream> +#include "tao/corba.h" + #include "ace/Service_Config.h" #include "ace/Log_Msg.h" -#include "ace/pre.h" - -#include "tao/corba.h" ACE_RCSID(tests_svc_loader, tests_svc_loader, "$Id$"); @@ -47,7 +45,7 @@ int main (int argc, char *argv []) if (argc < 2) { ACE_DEBUG ((LM_DEBUG, - "Usage: File name to be retrieved%s", + "Usage: %s <ior>\n", argv[0])); return -1; diff --git a/TAO/tao/Asynch_Invocation.cpp b/TAO/tao/Asynch_Invocation.cpp index bb705fc55db..f3daf0994ca 100644 --- a/TAO/tao/Asynch_Invocation.cpp +++ b/TAO/tao/Asynch_Invocation.cpp @@ -63,8 +63,6 @@ TAO_GIOP_Asynch_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) return this->invoke_i (ACE_TRY_ENV); } -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - // ************************************************************************** #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) @@ -107,3 +105,5 @@ TAO_GIOP_Twoway_Asynch_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) } #endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */ + +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ diff --git a/TAO/tao/Asynch_Invocation.h b/TAO/tao/Asynch_Invocation.h index 80992302ced..74daef41387 100644 --- a/TAO/tao/Asynch_Invocation.h +++ b/TAO/tao/Asynch_Invocation.h @@ -72,8 +72,6 @@ protected: // Reply dispatcher for the current asynchronous invocation. }; -#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ - #if (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) class TAO_Export TAO_GIOP_Twoway_Asynch_Invocation @@ -109,6 +107,8 @@ protected: #endif /* (TAO_HAS_AMI_CALLBACK == 1) || (TAO_HAS_AMI_POLLER == 1) == 0 */ +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */ + #if defined (__ACE_INLINE__) # include "tao/Asynch_Invocation.i" #endif /* __ACE_INLINE__ */ diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index fca2884c32c..601f80b9bf4 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -1,6 +1,9 @@ // $Id$ #include "CORBALOC_Parser.h" +#include "ORB_Core.h" +#include "Stub.h" +#include "Connector_Registry.h" #if !defined(__ACE_INLINE__) #include "CORBALOC_Parser.i" diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h index 41816e41d0f..6bef830524c 100644 --- a/TAO/tao/CORBALOC_Parser.h +++ b/TAO/tao/CORBALOC_Parser.h @@ -18,22 +18,21 @@ #define TAO_CORBALOC_PARSER_H #include "ace/pre.h" -#include "tao/ORB.h" -#include "tao/Connector_Registry.h" #include "tao/IOR_Parser.h" -#include "tao/Stub.h" -#include "tao/ORB_Core.h" - -#include "tao/PortableServer/POA.h" +// @@ Priyanka: notice how many includes I was able to remove. In +// general you should try to minimize the number of #includes in your +// .h files. In fact, I believe that once you remove the orb_ and +// mprofile_ fields below these two includes can go away too! +#include "tao/ORB.h" #include "tao/MProfile.h" -#include "ior_corbaloc_export.h" - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Service_Config.h" + class TAO_Export TAO_CORBALOC_Parser : public TAO_IOR_Parser { // = TITLE @@ -62,11 +61,18 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); // Parse the ior-string that is passed. - private: +private: + // @@ Priyanka: do you really need this (see next comment)? BTW, in + // general we put private data members *after* private methods. CORBA::ORB_var orb_; // ORB + // @@ Priyanka: this makes the class non-reentrant, only one thread + // can parse a string at a time. The "Right Thing"[tm] is to + // pass the MProfile to whatever helper methods you have, so they + // can add stuff to it. That way there is no resource + // contention. TAO_MProfile mprofile_; // One big mprofile which consists the profiles of all the endpoints. diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp index 32e469f33cf..7a8c93e856d 100644 --- a/TAO/tao/CORBANAME_Parser.cpp +++ b/TAO/tao/CORBANAME_Parser.cpp @@ -1,6 +1,8 @@ // $Id$ #include "CORBANAME_Parser.h" +#include "Invocation.h" +#include "Stub.h" #if !defined(__ACE_INLINE__) #include "CORBANAME_Parser.i" diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h index 2731d22a200..1aec718d046 100644 --- a/TAO/tao/CORBANAME_Parser.h +++ b/TAO/tao/CORBANAME_Parser.h @@ -17,18 +17,14 @@ #define TAO_CORBANAME_PARSER_H #include "ace/pre.h" -#include "tao/Object_Loader.h" -#include "tao/Object.h" -#include "tao/corba.h" -#include "tao/ORB.h" - #include "tao/IOR_Parser.h" -#include "ior_corbaname_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "ace/Service_Config.h" + class TAO_Export TAO_CORBANAME_Parser : public TAO_IOR_Parser { // = TITLE diff --git a/TAO/tao/DynamicAny/Makefile b/TAO/tao/DynamicAny/Makefile index d48f3fb79af..1fc512b3e41 100644 --- a/TAO/tao/DynamicAny/Makefile +++ b/TAO/tao/DynamicAny/Makefile @@ -385,13 +385,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h .obj/DynAnyFactory.o .obj/DynAnyFactory.so .shobj/DynAnyFactory.o .shobj/DynAnyFactory.so: DynAnyFactory.cpp DynAnyFactory.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -713,8 +711,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAny_i.h DynStruct_i.h DynSequence_i.h DynEnum_i.h \ DynArray_i.h DynUnion_i.h DynUnion_i_T.h DynUnion_i_T.cpp \ $(ACE_ROOT)/ace/Auto_Ptr.h \ @@ -722,8 +718,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Auto_Ptr.cpp .obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp DynAny_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1045,13 +1041,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h .obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp DynStruct_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1373,8 +1367,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -1404,8 +1396,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/OS.i \ + DynamicAny.h dynamicany_export.h \ $(TAO_ROOT)/tao/Object_Loader.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ @@ -1703,15 +1695,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp DynEnum_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2033,13 +2023,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h .obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp DynArray_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2361,15 +2349,13 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i .obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp DynUnion_i.h \ - $(ACE_ROOT)/ace/pre.h DynamicAny.h \ - dynamicany_export.h \ + $(ACE_ROOT)/ace/pre.h \ + DynamicAny.h dynamicany_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2691,8 +2677,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i DynUnion_i_T.h DynUnion_i_T.cpp DynAnyFactory.h \ $(TAO_ROOT)/tao/Marshal.h \ $(TAO_ROOT)/tao/Marshal.i @@ -3021,8 +3005,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ DynamicAnyC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/DynamicInterface/Makefile b/TAO/tao/DynamicInterface/Makefile index dd04ec41196..aeeec3f6da0 100644 --- a/TAO/tao/DynamicInterface/Makefile +++ b/TAO/tao/DynamicInterface/Makefile @@ -1384,7 +1384,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i Context.h \ + $(ACE_ROOT)/ace/OS.i \ + Context.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ diff --git a/TAO/tao/IORManipulation/Makefile b/TAO/tao/IORManipulation/Makefile index 31fb0c8d208..134fc0921db 100644 --- a/TAO/tao/IORManipulation/Makefile +++ b/TAO/tao/IORManipulation/Makefile @@ -196,7 +196,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i IORC.i \ + $(TAO_ROOT)/tao/CDR.i \ + IORC.i \ $(TAO_ROOT)/tao/Typecode.h \ $(TAO_ROOT)/tao/Typecode.i \ $(TAO_ROOT)/tao/Any.h \ @@ -354,8 +355,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i IORC.i \ - IORManipulation.h \ + $(TAO_ROOT)/tao/CDR.i \ + IORC.i IORManipulation.h \ $(TAO_ROOT)/tao/LocalObject.h \ $(TAO_ROOT)/tao/LocalObject.i @@ -502,7 +503,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - $(TAO_ROOT)/tao/CDR.i IORC.i \ + $(TAO_ROOT)/tao/CDR.i \ + IORC.i \ $(TAO_ROOT)/tao/MProfile.h \ $(TAO_ROOT)/tao/Profile.h \ $(TAO_ROOT)/tao/Tagged_Components.h \ diff --git a/TAO/tao/IORTable/Makefile b/TAO/tao/IORTable/Makefile index 0b4ae147041..979e3c50db9 100644 --- a/TAO/tao/IORTable/Makefile +++ b/TAO/tao/IORTable/Makefile @@ -375,8 +375,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ IORTableC.i Table_Adapter.h .obj/IORTableC.o .obj/IORTableC.so .shobj/IORTableC.o .shobj/IORTableC.so: IORTableC.cpp IORTableC.h \ @@ -699,8 +697,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ iortable_export.h IORTableC.i .obj/Table_Adapter.o .obj/Table_Adapter.so .shobj/Table_Adapter.o .shobj/Table_Adapter.so: Table_Adapter.cpp Table_Adapter.h \ @@ -1025,13 +1021,11 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ IORTableC.i .obj/IOR_Table_Impl.o .obj/IOR_Table_Impl.so .shobj/IOR_Table_Impl.o .shobj/IOR_Table_Impl.so: IOR_Table_Impl.cpp IOR_Table_Impl.h \ - $(ACE_ROOT)/ace/pre.h IORTable.h \ - iortable_export.h \ + $(ACE_ROOT)/ace/pre.h \ + IORTable.h iortable_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -1351,8 +1345,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \ - $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \ IORTableC.i # IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile index da958e9dcbe..3f462886c09 100644 --- a/TAO/tao/Makefile +++ b/TAO/tao/Makefile @@ -728,7 +728,8 @@ realclean: target_specification.i .obj/Profile.o .obj/Profile.so .shobj/Profile.o .shobj/Profile.so: Profile.cpp Profile.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -995,7 +996,8 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ ORB_Core.i \ - Stub.i debug.h + Stub.i \ + debug.h .obj/Endpoint.o .obj/Endpoint.so .shobj/Endpoint.o .shobj/Endpoint.so: Endpoint.cpp \ Endpoint.h \ @@ -5792,7 +5794,22 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ Protocol_Factory.h \ - default_resource.i + default_resource.i \ + $(ACE_ROOT)/ace/XtReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.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_Base.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + xt_resource.i .obj/qt_resource.o .obj/qt_resource.so .shobj/qt_resource.o .shobj/qt_resource.so: qt_resource.cpp \ qt_resource.h \ @@ -5975,7 +5992,25 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ Protocol_Factory.h \ - default_resource.i + default_resource.i \ + $(ACE_ROOT)/ace/QtReactor.h \ + $(ACE_ROOT)/ace/Select_Reactor.h \ + $(ACE_ROOT)/ace/Select_Reactor_T.h \ + $(ACE_ROOT)/ace/Select_Reactor_Base.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_Base.i \ + $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ + $(ACE_ROOT)/ace/Timer_Heap.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.h \ + $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ + $(ACE_ROOT)/ace/Select_Reactor_T.i \ + $(ACE_ROOT)/ace/Map_Manager.h \ + $(ACE_ROOT)/ace/Map_Manager.i \ + $(ACE_ROOT)/ace/Map_Manager.cpp \ + qt_resource.i .obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \ Marshal.h \ @@ -9535,71 +9570,35 @@ realclean: TAO_Export.h \ corbafwd.i \ Object_Proxy_Impl.h \ - corba.h \ - Environment.h \ - Environment.i \ - ORB.h \ Exception.h \ $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ - Services.h \ - Sequence.h \ - Managed_Types.h \ - Managed_Types.i \ - Sequence.i \ - Sequence_T.h \ - Sequence_T.i \ - Sequence_T.cpp \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - PolicyC.h \ - CurrentC.h \ - Object.h \ - Abstract_Servant_Base.h \ - Object_Proxy_Broker.h \ - Object.i \ - CurrentC.i \ - Encodable.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ CDR.i \ + Environment.h \ + Environment.i \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object.i \ Typecode.h \ Typecode.i \ - PolicyC.i \ - ORB.i \ - Any.h \ Any.i \ - NVList.h \ - NVList.i \ - Principal.h \ - OctetSeqC.h \ - OctetSeqC.i \ - Principal.i \ - TAO_Server_Request.h \ - GIOP_Message_Base.h \ - GIOP_Message_State.h \ - Pluggable_Messaging.h \ - Pluggable_Messaging_Utils.h \ - IOPC.h \ - IOPC.i \ - Pluggable_Messaging_Utils.i \ - Pluggable_Messaging.i \ - GIOP_Message_State.i \ - GIOP_Message_Base.i \ - Tagged_Profile.h \ - GIOPC.h \ - Object_KeyC.h \ - Object_KeyC.i \ - GIOPC.i \ - Tagged_Profile.i \ - TAO_Server_Request.i \ - LocalObject.h \ - LocalObject.i \ Stub.h \ Pluggable.h \ + Sequence.h \ + Managed_Types.h \ + Managed_Types.i \ + Sequence.i \ + Sequence_T.h \ + Sequence_T.i \ + Sequence_T.cpp \ + IOPC.h \ + IOPC.i \ $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ @@ -9666,10 +9665,29 @@ realclean: CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + GIOP_Message_State.h \ + Pluggable_Messaging.h \ + Pluggable_Messaging_Utils.h \ + Pluggable_Messaging_Utils.i \ + Pluggable_Messaging.i \ + GIOP_Message_State.i \ Profile.i \ MProfile.i \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + ORB.i \ ORB_Core.h \ Policy_Manager.h \ + LocalObject.h \ + LocalObject.i \ Policy_Manager.i \ Resource_Factory.h \ Protocol_Factory.h \ @@ -9721,9 +9739,6 @@ realclean: Interceptor_List.inl \ ORB_Core.i \ Stub.i \ - debug.h \ - Client_Strategy_Factory.h \ - Server_Strategy_Factory.h \ Invocation.h \ Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ @@ -9738,30 +9753,17 @@ realclean: TAOC.i \ operation_details.h \ target_specification.h \ + Object_KeyC.h \ + Object_KeyC.i \ target_specification.i \ operation_details.i \ Invocation_Endpoint_Selectors.h \ Invocation_Endpoint_Selectors.i \ - Invocation.i \ - ObjectIDList.h \ - ObjectIDList.i \ - DomainC.h \ - ClientRequestInfo.h \ - StringSeqC.h \ - StringSeqC.i \ - DomainC.i \ - WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ - BoundsC.h \ - BoundsC.i \ - PortableInterceptor.h \ - PortableInterceptor.i \ - PortableServer/ServerRequestInfo.h \ - PortableServer/portableserver_export.h + Invocation.i .obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp DomainC.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -10824,7 +10826,8 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - Endpoint.i Stub.h \ + Endpoint.i \ + Stub.h \ Pluggable.h \ Sequence.h \ Managed_Types.h \ @@ -10992,8 +10995,8 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ ORB_Core.i \ - Stub.i Sequence.h \ - Object.h Invocation.h \ + Stub.i \ + Sequence.h Object.h Invocation.h \ Synch_Reply_Dispatcher.h \ Reply_Dispatcher.h \ Reply_Dispatcher.i \ @@ -13672,7 +13675,8 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - DynamicC.h Any.h \ + DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -13949,7 +13953,8 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - OctetSeqC.i Any.h \ + OctetSeqC.i \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -14200,7 +14205,8 @@ realclean: Smart_Proxies.i .obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp ORB_Core.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -14294,7 +14300,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i ORB.h \ + corbafwd.i \ + ORB.h \ corbafwd.h \ Exception.h \ $(ACE_ROOT)/ace/SString.h \ @@ -14399,7 +14406,8 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ Protocol_Factory.h \ - params.h params.i \ + params.h \ + params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -14408,9 +14416,10 @@ realclean: TAO_Singleton.h \ TAO_Singleton_Manager.h \ Adapter.h Adapter.i PolicyFactory_Registry.h PortableInterceptorC.h \ - DynamicC.h Any.h \ - Any.i DynamicC.i \ - MessagingC.h \ + DynamicC.h \ + Any.h \ + Any.i \ + DynamicC.i MessagingC.h \ ValueBase.h \ ValueBase.i \ ValueFactory.h \ @@ -14469,7 +14478,8 @@ realclean: Pluggable_Messaging.i \ GIOP_Message_State.i \ Profile.i \ - MProfile.i Stub.h \ + MProfile.i \ + Stub.h \ MProfile.h \ ORB.h \ ORB_Core.h \ @@ -16077,16 +16087,10 @@ realclean: default_resource.i \ IIOP_Factory.h \ CORBANAME_Parser.h \ - Object_Loader.h \ - Object_Loader.i \ - Object.h \ - Abstract_Servant_Base.h \ - Object_Proxy_Broker.h \ - Object_Proxy_Impl.h \ - Object.i \ - corba.h \ - Environment.h \ - Environment.i \ + IOR_Parser.h \ + IOR_Parser.i \ + CORBANAME_Parser.i \ + CORBALOC_Parser.h \ ORB.h \ Services.h \ Services.i \ @@ -16094,175 +16098,38 @@ realclean: CORBA_String.inl \ PolicyC.h \ CurrentC.h \ + Object.h \ + Abstract_Servant_Base.h \ + Object_Proxy_Broker.h \ + Object_Proxy_Impl.h \ + Object.i \ CurrentC.i \ Encodable.h \ + Environment.h \ + Environment.i \ PolicyC.i \ ORB.i \ - Any.h \ - Any.i \ - NVList.h \ - NVList.i \ - Principal.h \ - OctetSeqC.h \ - OctetSeqC.i \ - Principal.i \ - TAO_Server_Request.h \ - GIOP_Message_Base.h \ - GIOP_Message_State.h \ - Pluggable_Messaging.h \ - Pluggable_Messaging_Utils.h \ - Pluggable_Messaging_Utils.i \ - Pluggable_Messaging.i \ - GIOP_Message_State.i \ - GIOP_Message_Base.i \ - Tagged_Profile.h \ - GIOPC.h \ - Object_KeyC.h \ - Object_KeyC.i \ - GIOPC.i \ - Tagged_Profile.i \ - TAO_Server_Request.i \ - LocalObject.h \ - LocalObject.i \ - Stub.h \ MProfile.h \ Profile.h \ Tagged_Components.h \ CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ + GIOP_Message_State.h \ + Pluggable_Messaging.h \ + Pluggable_Messaging_Utils.h \ + Pluggable_Messaging_Utils.i \ + Pluggable_Messaging.i \ + GIOP_Message_State.i \ Profile.i \ MProfile.i \ - ORB_Core.h \ - Policy_Manager.h \ - Policy_Manager.i \ - params.h \ - params.i \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - Adapter.h \ - Adapter.i \ - PolicyFactory_Registry.h \ - PortableInterceptorC.h \ - DynamicC.h \ - DynamicC.i \ - MessagingC.h \ - ValueBase.h \ - ValueBase.i \ - ValueFactory.h \ - ValueFactory.i \ - TimeBaseC.h \ - TimeBaseC.i \ - PollableC.h \ - PollableC.i \ - MessagingC.i \ - PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - Parser_Registry.h \ - Parser_Registry.i \ - Service_Callbacks.h \ - Service_Callbacks.i \ - Fault_Tolerance_Service.h \ - Fault_Tolerance_Service.i \ - Connection_Cache_Manager.h \ - Cache_Entries.h \ - Base_Connection_Property.h \ - Endpoint.h \ - Endpoint.i \ - Base_Connection_Property.inl \ - Cache_Entries.inl \ - Connection_Cache_Manager.inl \ - Cleanup_Func_Registry.h \ - Cleanup_Func_Registry.inl \ - Object_Ref_Table.h \ - Interceptor_List.h \ - Interceptor_List.inl \ - ORB_Core.i \ - Stub.i \ - debug.h \ - Invocation.h \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - Reply_Dispatcher.i \ - TAOC.h \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ - Priority_Mapping.i \ - Priority_Mapping_Manager.i \ - TAOC.i \ - operation_details.h \ - target_specification.h \ - target_specification.i \ - operation_details.i \ - Invocation_Endpoint_Selectors.h \ - Invocation_Endpoint_Selectors.i \ - Invocation.i \ - ObjectIDList.h \ - ObjectIDList.i \ - DomainC.h \ - ClientRequestInfo.h \ - StringSeqC.h \ - StringSeqC.i \ - DomainC.i \ - WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ - BoundsC.h \ - BoundsC.i \ - PortableInterceptor.h \ - PortableInterceptor.i \ - PortableServer/ServerRequestInfo.h \ - PortableServer/portableserver_export.h \ - IOR_Parser.h \ - IOR_Parser.i \ - ior_corbaname_export.h \ - CORBANAME_Parser.i \ - CORBALOC_Parser.h \ - Connector_Registry.h \ - Connector_Registry.i \ - PortableServer/POA.h \ - PortableServer/Object_Adapter.h \ - PortableServer/Key_Adapters.h \ - PortableServer/PortableServerC.h \ - PortableServer/PortableServerC.i \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - PortableServer/Key_Adapters.i \ - PortableServer/poa_macros.h \ - PortableServer/RTPortableServerC.h \ - PortableServer/RTPortableServerC.i \ - PortableServer/Servant_Base.h \ - PortableServer/Servant_Base.i \ - PortableServer/Active_Object_Map.h \ - PortableServer/Active_Object_Map.i \ - PortableServer/Object_Adapter.i \ - PortableServer/POAManager.h \ - PortableServer/POAManager.i \ - PortableServer/POA.i \ - ior_corbaloc_export.h \ CORBALOC_Parser.i \ FILE_Parser.h \ FILE_Parser.i \ DLL_Parser.h \ - DLL_Parser.i + DLL_Parser.i \ + Object_Loader.h \ + Object_Loader.i .obj/TAO_Server_Request.o .obj/TAO_Server_Request.so .shobj/TAO_Server_Request.o .shobj/TAO_Server_Request.so: TAO_Server_Request.cpp \ TAO_Server_Request.h \ @@ -19000,7 +18867,8 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i Any.h \ + IOPC.i \ + Any.h \ Environment.h \ Environment.i \ Object.h \ @@ -19235,7 +19103,8 @@ realclean: CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i PollableC.i \ + CDR.i \ + PollableC.i \ Stub.h \ Pluggable.h \ Sequence.h \ @@ -19523,8 +19392,8 @@ realclean: CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i PollableC.i \ - PollableS_T.h PollableS_T.i PollableS_T.cpp PollableS.i + CDR.i \ + PollableC.i PollableS_T.h PollableS_T.i PollableS_T.cpp PollableS.i .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \ CONV_FRAMEC.h \ @@ -20274,7 +20143,8 @@ realclean: IOPC.i \ Object_KeyC.h \ Object_KeyC.i \ - GIOPC.i GIOPS_T.h \ + GIOPC.i \ + GIOPS_T.h \ GIOPS_T.i \ GIOPS_T.cpp \ GIOPS.i @@ -20538,7 +20408,8 @@ realclean: LocalObject.h \ LocalObject.i \ Priority_Mapping_Manager.i \ - TAOC.i TAOS.h \ + TAOC.i \ + TAOS.h \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -22288,7 +22159,7 @@ realclean: .obj/CORBALOC_Parser.o .obj/CORBALOC_Parser.so .shobj/CORBALOC_Parser.o .shobj/CORBALOC_Parser.so: CORBALOC_Parser.cpp CORBALOC_Parser.h \ $(ACE_ROOT)/ace/pre.h \ - ORB.h \ + IOR_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -22388,6 +22259,12 @@ realclean: $(ACE_ROOT)/ace/SString.h \ $(ACE_ROOT)/ace/SString.i \ Exception.i \ + $(ACE_ROOT)/ace/Service_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.h \ + $(ACE_ROOT)/ace/Shared_Object.i \ + $(ACE_ROOT)/ace/Service_Object.i \ + IOR_Parser.i \ + ORB.h \ Services.h \ Sequence.h \ Managed_Types.h \ @@ -22418,79 +22295,11 @@ realclean: Environment.i \ PolicyC.i \ ORB.i \ - Connector_Registry.h \ - Pluggable.h \ - IOPC.h \ - IOPC.i \ - $(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/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/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/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(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/Thread_Manager.h \ - $(ACE_ROOT)/ace/Singleton.h \ - $(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 \ - $(ACE_ROOT)/ace/Thread_Manager.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager.h \ - $(ACE_ROOT)/ace/Functor.h \ - $(ACE_ROOT)/ace/Functor.i \ - $(ACE_ROOT)/ace/Functor_T.h \ - $(ACE_ROOT)/ace/Functor_T.i \ - $(ACE_ROOT)/ace/Functor_T.cpp \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Hash_Map_Manager_T.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/Process_Mutex.h \ - $(ACE_ROOT)/ace/Process_Mutex.inl \ - $(ACE_ROOT)/ace/WFMO_Reactor.i \ - $(ACE_ROOT)/ace/Strategies.i \ - $(ACE_ROOT)/ace/Message_Queue.i \ - Pluggable.i \ - params.h \ - params.i \ - Connector_Registry.i \ - IOR_Parser.h \ - IOR_Parser.i \ - Stub.h \ MProfile.h \ Profile.h \ Tagged_Components.h \ + IOPC.h \ + IOPC.i \ CONV_FRAMEC.h \ CONV_FRAMEC.i \ Tagged_Components.i \ @@ -22502,102 +22311,11 @@ realclean: GIOP_Message_State.i \ Profile.i \ MProfile.i \ - ORB_Core.h \ - Policy_Manager.h \ - LocalObject.h \ - LocalObject.i \ - Policy_Manager.i \ - Resource_Factory.h \ - Protocol_Factory.h \ - TAO_Singleton_Manager.h \ - TAO_Singleton_Manager.inl \ - TAO_Singleton.h \ - TAO_Singleton.inl \ - TAO_Singleton.cpp \ - Adapter.h \ - Adapter.i \ - PolicyFactory_Registry.h \ - PortableInterceptorC.h \ - DynamicC.h \ - Any.h \ - Any.i \ - DynamicC.i \ - MessagingC.h \ - ValueBase.h \ - ValueBase.i \ - ValueFactory.h \ - ValueFactory.i \ - TimeBaseC.h \ - TimeBaseC.i \ - PollableC.h \ - PollableC.i \ - MessagingC.i \ - PortableInterceptorC.i \ - $(ACE_ROOT)/ace/Map_Manager.h \ - $(ACE_ROOT)/ace/Map_Manager.i \ - $(ACE_ROOT)/ace/Map_Manager.cpp \ - Parser_Registry.h \ - Parser_Registry.i \ - Service_Callbacks.h \ - Service_Callbacks.i \ - Fault_Tolerance_Service.h \ - Fault_Tolerance_Service.i \ - Connection_Cache_Manager.h \ - Cache_Entries.h \ - Base_Connection_Property.h \ - Endpoint.h \ - Endpoint.i \ - Base_Connection_Property.inl \ - Cache_Entries.inl \ - Connection_Cache_Manager.inl \ - Cleanup_Func_Registry.h \ - Cleanup_Func_Registry.inl \ - Object_Ref_Table.h \ - Interceptor_List.h \ - Interceptor_List.inl \ - ORB_Core.i \ - Stub.i \ - PortableServer/POA.h \ - PortableServer/Object_Adapter.h \ - PortableServer/portableserver_export.h \ - PortableServer/Key_Adapters.h \ - PortableServer/PortableServerC.h \ - PortableServer/PortableServerC.i \ - $(ACE_ROOT)/ace/Map.h \ - $(ACE_ROOT)/ace/Map_T.h \ - $(ACE_ROOT)/ace/Pair.h \ - $(ACE_ROOT)/ace/Pair_T.h \ - $(ACE_ROOT)/ace/Pair_T.i \ - $(ACE_ROOT)/ace/Pair_T.cpp \ - $(ACE_ROOT)/ace/Active_Map_Manager.h \ - $(ACE_ROOT)/ace/Active_Map_Manager.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.h \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.i \ - $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \ - $(ACE_ROOT)/ace/Map_T.i \ - $(ACE_ROOT)/ace/Map_T.cpp \ - PortableServer/Key_Adapters.i \ - PortableServer/poa_macros.h \ - PortableServer/RTPortableServerC.h \ - RTCORBAC.h \ - RTCORBAC.i \ - PortableServer/RTPortableServerC.i \ - PortableServer/Servant_Base.h \ - PortableServer/Servant_Base.i \ - PortableServer/Active_Object_Map.h \ - Server_Strategy_Factory.h \ - PortableServer/Active_Object_Map.i \ - PortableServer/Object_Adapter.i \ - PortableServer/POAManager.h \ - PortableServer/POAManager.i \ - Object_KeyC.h \ - Object_KeyC.i \ - PortableServer/POA.i \ - ior_corbaloc_export.h CORBALOC_Parser.i + CORBALOC_Parser.i .obj/CORBANAME_Parser.o .obj/CORBANAME_Parser.so .shobj/CORBANAME_Parser.o .shobj/CORBANAME_Parser.so: CORBANAME_Parser.cpp CORBANAME_Parser.h \ $(ACE_ROOT)/ace/pre.h \ - Object_Loader.h \ + IOR_Parser.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ @@ -22693,25 +22411,49 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ + Exception.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + Exception.i \ $(ACE_ROOT)/ace/Service_Object.h \ $(ACE_ROOT)/ace/Shared_Object.h \ $(ACE_ROOT)/ace/Shared_Object.i \ $(ACE_ROOT)/ace/Service_Object.i \ - Object_Loader.i \ + IOR_Parser.i \ + $(ACE_ROOT)/ace/Service_Config.h \ + $(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/Test_and_Set.h \ + $(ACE_ROOT)/ace/Test_and_Set.i \ + $(ACE_ROOT)/ace/Test_and_Set.cpp \ + $(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 \ + CORBANAME_Parser.i Invocation.h \ + CDR.h \ + $(ACE_ROOT)/ace/CDR_Stream.h \ + $(ACE_ROOT)/ace/CDR_Stream.i \ + CDR.i \ + Any.h \ + Environment.h \ + Environment.i \ Object.h \ Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ Object_Proxy_Impl.h \ Object.i \ - corba.h \ - Environment.h \ - Environment.i \ - ORB.h \ - Exception.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - Exception.i \ - Services.h \ + Typecode.h \ + Typecode.i \ + Any.i \ + Synch_Reply_Dispatcher.h \ + Reply_Dispatcher.h \ + IOPC.h \ Sequence.h \ Managed_Types.h \ Managed_Types.i \ @@ -22719,49 +22461,48 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - Services.i \ - CORBA_String.h \ - CORBA_String.inl \ - PolicyC.h \ - CurrentC.h \ - CurrentC.i \ - Encodable.h \ - CDR.h \ - $(ACE_ROOT)/ace/CDR_Stream.h \ - $(ACE_ROOT)/ace/CDR_Stream.i \ - CDR.i \ - Typecode.h \ - Typecode.i \ - PolicyC.i \ - ORB.i \ - Any.h \ - Any.i \ - NVList.h \ - NVList.i \ - Principal.h \ - OctetSeqC.h \ - OctetSeqC.i \ - Principal.i \ - TAO_Server_Request.h \ - GIOP_Message_Base.h \ + IOPC.i \ + Reply_Dispatcher.i \ GIOP_Message_State.h \ Pluggable_Messaging.h \ Pluggable_Messaging_Utils.h \ - IOPC.h \ - IOPC.i \ Pluggable_Messaging_Utils.i \ Pluggable_Messaging.i \ GIOP_Message_State.i \ - GIOP_Message_Base.i \ - Tagged_Profile.h \ - GIOPC.h \ - Object_KeyC.h \ - Object_KeyC.i \ - GIOPC.i \ - Tagged_Profile.i \ - TAO_Server_Request.i \ + TAOC.h \ + PolicyC.h \ + CurrentC.h \ + CurrentC.i \ + Encodable.h \ + PolicyC.i \ + TimeBaseC.h \ + TimeBaseC.i \ + Priority_Mapping_Manager.h \ + Priority_Mapping.h \ + RTCORBAC.h \ + RTCORBAC.i \ + Priority_Mapping.i \ LocalObject.h \ LocalObject.i \ + Priority_Mapping_Manager.i \ + TAOC.i \ + operation_details.h \ + target_specification.h \ + Object_KeyC.h \ + Object_KeyC.i \ + target_specification.i \ + operation_details.i \ + Invocation_Endpoint_Selectors.h \ + MProfile.h \ + Profile.h \ + Tagged_Components.h \ + CONV_FRAMEC.h \ + CONV_FRAMEC.i \ + Tagged_Components.i \ + Profile.i \ + MProfile.i \ + Invocation_Endpoint_Selectors.i \ + Invocation.i \ Stub.h \ Pluggable.h \ $(ACE_ROOT)/ace/Message_Queue.h \ @@ -22771,21 +22512,6 @@ realclean: $(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/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/Test_and_Set.h \ - $(ACE_ROOT)/ace/Test_and_Set.i \ - $(ACE_ROOT)/ace/Test_and_Set.cpp \ - $(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/Thread_Manager.h \ @@ -22820,14 +22546,12 @@ realclean: $(ACE_ROOT)/ace/Strategies.i \ $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ - MProfile.h \ - Profile.h \ - Tagged_Components.h \ - CONV_FRAMEC.h \ - CONV_FRAMEC.i \ - Tagged_Components.i \ - Profile.i \ - MProfile.i \ + ORB.h \ + Services.h \ + Services.i \ + CORBA_String.h \ + CORBA_String.inl \ + ORB.i \ ORB_Core.h \ Policy_Manager.h \ Policy_Manager.i \ @@ -22851,8 +22575,6 @@ realclean: ValueBase.i \ ValueFactory.h \ ValueFactory.i \ - TimeBaseC.h \ - TimeBaseC.i \ PollableC.h \ PollableC.i \ MessagingC.i \ @@ -22880,48 +22602,7 @@ realclean: Interceptor_List.h \ Interceptor_List.inl \ ORB_Core.i \ - Stub.i \ - debug.h \ - Client_Strategy_Factory.h \ - Server_Strategy_Factory.h \ - Invocation.h \ - Synch_Reply_Dispatcher.h \ - Reply_Dispatcher.h \ - Reply_Dispatcher.i \ - TAOC.h \ - Priority_Mapping_Manager.h \ - Priority_Mapping.h \ - RTCORBAC.h \ - RTCORBAC.i \ - Priority_Mapping.i \ - Priority_Mapping_Manager.i \ - TAOC.i \ - operation_details.h \ - target_specification.h \ - target_specification.i \ - operation_details.i \ - Invocation_Endpoint_Selectors.h \ - Invocation_Endpoint_Selectors.i \ - Invocation.i \ - ObjectIDList.h \ - ObjectIDList.i \ - DomainC.h \ - ClientRequestInfo.h \ - StringSeqC.h \ - StringSeqC.i \ - DomainC.i \ - WrongTransactionC.h \ - InterfaceC.h \ - ifrfwd.h \ - BoundsC.h \ - BoundsC.i \ - PortableInterceptor.h \ - PortableInterceptor.i \ - PortableServer/ServerRequestInfo.h \ - PortableServer/portableserver_export.h \ - IOR_Parser.h \ - IOR_Parser.i \ - ior_corbaname_export.h CORBANAME_Parser.i + Stub.i .obj/Bind_Dispatcher_Guard.o .obj/Bind_Dispatcher_Guard.so .shobj/Bind_Dispatcher_Guard.o .shobj/Bind_Dispatcher_Guard.so: Bind_Dispatcher_Guard.cpp \ Bind_Dispatcher_Guard.h \ @@ -23445,7 +23126,8 @@ realclean: CORBA_String.inl .obj/ORBInitInfo.o .obj/ORBInitInfo.so .shobj/ORBInitInfo.o .shobj/ORBInitInfo.so: ORBInitInfo.cpp ORBInitInfo.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -23542,7 +23224,8 @@ realclean: corbafwd.i \ PortableInterceptorC.h \ corbafwd.h \ - DynamicC.h Any.h \ + DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -23658,7 +23341,8 @@ realclean: $(ACE_ROOT)/ace/Message_Queue.i \ Pluggable.i \ Protocol_Factory.h \ - params.h params.i \ + params.h \ + params.i \ TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ TAO_Singleton.h \ @@ -23689,7 +23373,8 @@ realclean: .obj/ORBInitializer_Registry.o .obj/ORBInitializer_Registry.so .shobj/ORBInitializer_Registry.o .shobj/ORBInitializer_Registry.so: ORBInitializer_Registry.cpp \ ORBInitializer_Registry.h \ - $(ACE_ROOT)/ace/pre.h TAO_Export.h \ + $(ACE_ROOT)/ace/pre.h \ + TAO_Export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -23786,7 +23471,8 @@ realclean: varbase.h \ TAO_Export.h \ corbafwd.i \ - DynamicC.h Any.h \ + DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -23840,7 +23526,8 @@ realclean: TAO_Singleton_Manager.h \ TAO_Singleton_Manager.inl \ ORBInitializer_Registry.inl \ - ORB.h Services.h \ + ORB.h \ + Services.h \ Services.i \ CORBA_String.h \ CORBA_String.inl \ @@ -23849,7 +23536,8 @@ realclean: .obj/PolicyFactory_Registry.o .obj/PolicyFactory_Registry.so .shobj/PolicyFactory_Registry.o .shobj/PolicyFactory_Registry.so: PolicyFactory_Registry.cpp \ PolicyFactory_Registry.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -23946,7 +23634,8 @@ realclean: corbafwd.i \ PortableInterceptorC.h \ corbafwd.h \ - DynamicC.h Any.h \ + DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -24484,7 +24173,8 @@ realclean: .obj/Cleanup_Func_Registry.o .obj/Cleanup_Func_Registry.so .shobj/Cleanup_Func_Registry.o .shobj/Cleanup_Func_Registry.so: Cleanup_Func_Registry.cpp \ Cleanup_Func_Registry.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -24582,7 +24272,8 @@ realclean: Cleanup_Func_Registry.inl .obj/IORInfo.o .obj/IORInfo.so .shobj/IORInfo.o .shobj/IORInfo.so: IORInfo.cpp IORInfo.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -24679,7 +24370,8 @@ realclean: corbafwd.i \ PortableInterceptorC.h \ corbafwd.h \ - DynamicC.h Any.h \ + DynamicC.h \ + Any.h \ CDR.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ $(ACE_ROOT)/ace/CDR_Stream.i \ @@ -24739,7 +24431,8 @@ realclean: MProfile.i .obj/Object_Ref_Table.o .obj/Object_Ref_Table.so .shobj/Object_Ref_Table.o .shobj/Object_Ref_Table.so: Object_Ref_Table.cpp Object_Ref_Table.h \ - $(ACE_ROOT)/ace/pre.h corbafwd.h \ + $(ACE_ROOT)/ace/pre.h \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ @@ -24868,7 +24561,14 @@ realclean: Abstract_Servant_Base.h \ Object_Proxy_Broker.h \ Object_Proxy_Impl.h \ - Object.i + Object.i \ + Exception.h \ + Exception.i \ + Environment.h \ + Environment.i \ + CORBA_String.h \ + CORBA_String.inl \ + debug.h .obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \ Services.h \ @@ -28039,7 +27739,8 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i corbafwd.h \ + $(ACE_ROOT)/ace/OS.i \ + corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/ACE.h \ @@ -28109,7 +27810,8 @@ realclean: $(ACE_ROOT)/ace/CORBA_macros.h \ varbase.h \ TAO_Export.h \ - corbafwd.i IOPC.h \ + corbafwd.i \ + IOPC.h \ CDR.h \ corbafwd.h \ $(ACE_ROOT)/ace/CDR_Stream.h \ @@ -28122,7 +27824,8 @@ realclean: Sequence_T.h \ Sequence_T.i \ Sequence_T.cpp \ - IOPC.i PolicyC.h \ + IOPC.i \ + PolicyC.h \ CurrentC.h \ Object.h \ Abstract_Servant_Base.h \ @@ -28140,10 +27843,12 @@ realclean: Environment.h \ Environment.i \ PolicyC.i \ - TimeBaseC.h Any.h \ + TimeBaseC.h \ + Any.h \ Any.i \ TimeBaseC.i \ - RTCORBAC.i TAOS.h \ + RTCORBAC.i \ + TAOS.h \ TAOS_T.h \ TAOS_T.i \ TAOS_T.cpp \ @@ -28174,8 +27879,8 @@ realclean: $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i RTCORBAS.h \ - orbconf.h IOPS.h IOPC.h \ + $(ACE_ROOT)/ace/OS.i \ + RTCORBAS.h orbconf.h IOPS.h IOPC.h \ TAO_Export.h \ CDR.h \ corbafwd.h \ diff --git a/TAO/tao/PortableServer/Makefile b/TAO/tao/PortableServer/Makefile index 7c36849809c..c74a2bc2438 100644 --- a/TAO/tao/PortableServer/Makefile +++ b/TAO/tao/PortableServer/Makefile @@ -476,7 +476,8 @@ CPPFLAGS += -I$(TAO_ROOT) Object_Adapter.i POAManager.h POAManager.i \ $(TAO_ROOT)/tao/Object_KeyC.h \ $(TAO_ROOT)/tao/Object_KeyC.i \ - POA.i $(TAO_ROOT)/tao/ORB.h \ + POA.i \ + $(TAO_ROOT)/tao/ORB.h \ $(TAO_ROOT)/tao/Services.h \ $(TAO_ROOT)/tao/Services.i \ $(TAO_ROOT)/tao/CORBA_String.h \ @@ -1466,8 +1467,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - ServerRequestInfo.h \ - portableserver_export.h \ $(ACE_ROOT)/ace/Auto_Ptr.h \ $(ACE_ROOT)/ace/Auto_Ptr.i \ $(ACE_ROOT)/ace/Auto_Ptr.cpp \ @@ -2019,8 +2018,8 @@ CPPFLAGS += -I$(TAO_ROOT) POA.i .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp Active_Object_Map.h \ - $(ACE_ROOT)/ace/pre.h Key_Adapters.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + Key_Adapters.h PortableServerC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -2329,7 +2328,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i Servant_Base.i POA.h Object_Adapter.h \ - Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ + Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -3311,8 +3311,6 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/BoundsC.i \ $(TAO_ROOT)/tao/PortableInterceptor.h \ $(TAO_ROOT)/tao/PortableInterceptor.i \ - ServerRequestInfo.h \ - portableserver_export.h \ Direct_Object_Proxy_Impl.h ThruPOA_Object_Proxy_Impl.h \ $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h @@ -3447,7 +3445,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Any.h \ $(TAO_ROOT)/tao/Any.i \ PortableServerC.i Servant_Base.i Collocated_Object.i Object_Adapter.h \ - Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ + Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -3764,7 +3763,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/OctetSeqC.h \ $(TAO_ROOT)/tao/OctetSeqC.i \ DomainS_T.h DomainS_T.i DomainS_T.cpp DomainS.i Object_Adapter.h \ - Key_Adapters.h $(ACE_ROOT)/ace/Map.h \ + Key_Adapters.h \ + $(ACE_ROOT)/ace/Map.h \ $(ACE_ROOT)/ace/Map_T.h \ $(ACE_ROOT)/ace/Pair.h \ $(ACE_ROOT)/ace/Pair_T.h \ @@ -4818,8 +4818,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(TAO_ROOT)/tao/Invocation.i .obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \ - $(ACE_ROOT)/ace/pre.h ImplRepoC.h \ - portableserver_export.h \ + $(ACE_ROOT)/ace/pre.h \ + ImplRepoC.h portableserver_export.h \ $(ACE_ROOT)/ace/post.h \ $(ACE_ROOT)/ace/ACE_export.h \ $(ACE_ROOT)/ace/svc_export.h \ @@ -5147,8 +5147,8 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Basic_Types.h \ $(ACE_ROOT)/ace/Basic_Types.i \ $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/OS.i MessagingS.h \ - PortableServerC.h portableserver_export.h \ + $(ACE_ROOT)/ace/OS.i \ + MessagingS.h PortableServerC.h portableserver_export.h \ $(TAO_ROOT)/tao/corbafwd.h \ $(ACE_ROOT)/ace/CDR_Base.h \ $(ACE_ROOT)/ace/Message_Block.h \ diff --git a/TAO/tao/Remote_Object_Proxy_Impl.cpp b/TAO/tao/Remote_Object_Proxy_Impl.cpp index f10ae9a55d5..c6848584450 100644 --- a/TAO/tao/Remote_Object_Proxy_Impl.cpp +++ b/TAO/tao/Remote_Object_Proxy_Impl.cpp @@ -1,5 +1,10 @@ +// $Id$ + #include "tao/Remote_Object_Proxy_Impl.h" -#include "tao/corba.h" +#include "tao/Exception.h" +#include "tao/Any.h" +#include "tao/Stub.h" +#include "tao/Invocation.h" ACE_RCSID(tao, TAO_Remote_Object_Proxy_Impl, "$Id$") diff --git a/TAO/tao/Strategies/Makefile b/TAO/tao/Strategies/Makefile index e9d9ef95c6c..6802998a0de 100644 --- a/TAO/tao/Strategies/Makefile +++ b/TAO/tao/Strategies/Makefile @@ -5403,6 +5403,7 @@ CPPFLAGS += -I$(TAO_ROOT) $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ $(ACE_ROOT)/ace/Select_Reactor_T.i \ $(ACE_ROOT)/ace/FlReactor.h \ + $(ACE_ROOT)/ace/FlReactor.i \ $(ACE_ROOT)/ace/TkReactor.h \ $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \ $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i \ diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 2d7a5097d4f..4f65e7550b2 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -89,11 +89,7 @@ #include "tao/PortableInterceptor.h" // This needs to remain visible. -#if TAO_HAS_INTERCEPTORS == 1 #include "tao/ClientRequestInfo.h" -#include "tao/PortableServer/ServerRequestInfo.h" -#endif /* TAO_HAS_INTERCEPTORS */ - #if !defined (ACE_NESTED_CLASS) #if defined (ACE_WIN32) diff --git a/TAO/tao/ior_corbaloc_export.h b/TAO/tao/ior_corbaloc_export.h deleted file mode 100644 index 20ed4609b0c..00000000000 --- a/TAO/tao/ior_corbaloc_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_IOR_CORBALOC_EXPORT_H -#define TAO_IOR_CORBALOC_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_IOR_CORBALOC_HAS_DLL) -# define TAO_IOR_CORBALOC_HAS_DLL 0 -# endif /* ! TAO_IOR_CORBALOC_HAS_DLL */ -#else -# if !defined (TAO_IOR_CORBALOC_HAS_DLL) -# define TAO_IOR_CORBALOC_HAS_DLL 1 -# endif /* ! TAO_IOR_CORBALOC_HAS_DLL */ -#endif - -#if defined (TAO_IOR_CORBALOC_HAS_DLL) && (TAO_IOR_CORBALOC_HAS_DLL == 1) -# if defined (TAO_IOR_CORBALOC_BUILD_DLL) -# define TAO_IOR_CORBALOC_Export ACE_Proper_Export_Flag -# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_IOR_CORBALOC_BUILD_DLL */ -# define TAO_IOR_CORBALOC_Export ACE_Proper_Import_Flag -# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_IOR_CORBALOC_BUILD_DLL */ -#else /* TAO_IOR_CORBALOC_HAS_DLL == 1 */ -# define TAO_IOR_CORBALOC_Export -# define TAO_IOR_CORBALOC_SINGLETON_DECLARATION(T) -# define TAO_IOR_CORBALOC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_IOR_CORBALOC_HAS_DLL == 1 */ - -#endif /* TAO_IOR_CORBALOC_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/tao/ior_corbaname_export.h b/TAO/tao/ior_corbaname_export.h deleted file mode 100644 index 76e4f94c795..00000000000 --- a/TAO/tao/ior_corbaname_export.h +++ /dev/null @@ -1,40 +0,0 @@ - -// -*- C++ -*- -// $Id$ -// Definition for Win32 Export directives. -// This file is generated automatically by generate_export_file.pl -// ------------------------------ -#ifndef TAO_IOR_CORBANAME_EXPORT_H -#define TAO_IOR_CORBANAME_EXPORT_H - -#include "ace/config-all.h" - -#if defined (TAO_AS_STATIC_LIBS) -# if !defined (TAO_IOR_CORBANAME_HAS_DLL) -# define TAO_IOR_CORBANAME_HAS_DLL 0 -# endif /* ! TAO_IOR_CORBANAME_HAS_DLL */ -#else -# if !defined (TAO_IOR_CORBANAME_HAS_DLL) -# define TAO_IOR_CORBANAME_HAS_DLL 1 -# endif /* ! TAO_IOR_CORBANAME_HAS_DLL */ -#endif - -#if defined (TAO_IOR_CORBANAME_HAS_DLL) && (TAO_IOR_CORBANAME_HAS_DLL == 1) -# if defined (TAO_IOR_CORBANAME_BUILD_DLL) -# define TAO_IOR_CORBANAME_Export ACE_Proper_Export_Flag -# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T) -# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# else /* TAO_IOR_CORBANAME_BUILD_DLL */ -# define TAO_IOR_CORBANAME_Export ACE_Proper_Import_Flag -# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T) -# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -# endif /* TAO_IOR_CORBANAME_BUILD_DLL */ -#else /* TAO_IOR_CORBANAME_HAS_DLL == 1 */ -# define TAO_IOR_CORBANAME_Export -# define TAO_IOR_CORBANAME_SINGLETON_DECLARATION(T) -# define TAO_IOR_CORBANAME_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) -#endif /* TAO_IOR_CORBANAME_HAS_DLL == 1 */ - -#endif /* TAO_IOR_CORBANAME_EXPORT_H */ - -// End of auto generated file. diff --git a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp index 0e709d96e56..d640b25a32e 100644 --- a/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp +++ b/TAO/tests/ior_corbaloc/ior_corbaloc_client_i.cpp @@ -63,7 +63,7 @@ IOR_corbaloc_Client_i::run (CORBA::Environment &ACE_TRY_ENV) } // Invoke a request on the server - CORBA::Boolean ret_value = + CORBA::Boolean ret_value = factory->print_status (ACE_TRY_ENV); ACE_TRY_CHECK; @@ -113,7 +113,7 @@ IOR_corbaloc_Client_i::init (int argc, char **argv) // Get a reference to the Naming Service CORBA::Object_var naming_context_object = - orb->string_to_object (this->argv_[1], + orb->string_to_object (this->argv_[1], ACE_TRY_ENV); ACE_TRY_CHECK; |