From 6b09153dfa3fcf8ad79efa9ced1abef46485d9ff Mon Sep 17 00:00:00 2001 From: bala Date: Fri, 31 Oct 2003 05:21:44 +0000 Subject: ChangeLogTag:Thu Oct 30 23:23:05 2003 Balachandran Natarajan --- TAO/ChangeLog | 32 ++++++++++++++++++++++ TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile | 2 +- TAO/performance-tests/Latency/DII/Makefile | 2 +- TAO/performance-tests/Latency/DSI/Makefile | 2 +- TAO/performance-tests/Latency/Deferred/Makefile | 2 +- .../RTCorba/Oneways/Reliable/Makefile | 4 +-- .../Sequence_Latency/DII/Makefile | 2 +- .../Sequence_Latency/DSI/Makefile | 2 +- .../Sequence_Latency/Deferred/Makefile | 2 +- TAO/tao/Messaging/Asynch_Timeout_Handler.cpp | 2 -- TAO/tao/Messaging/Asynch_Timeout_Handler.h | 4 --- TAO/tao/Messaging/Messaging.cpp | 2 -- TAO/tao/Messaging/Messaging.h | 3 -- TAO/tao/Messaging/Messaging.mpc | 18 ++++++++++++ TAO/tests/OBV/Supports/Supports_Test_impl.cpp | 8 ++++-- TAO/tests/Xt_Stopwatch/Stopwatch_display.h | 4 ++- 16 files changed, 67 insertions(+), 24 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dcdd036764d..f3cc2b51bc2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,35 @@ +Thu Oct 30 23:23:05 2003 Balachandran Natarajan + + * performance-tests/Cubit/TAO/DII_Cubit/Makefile: + * performance-tests/Latency/DII/Makefile: + * performance-tests/Latency/DSI/Makefile: + * performance-tests/Latency/Deferred/Makefile: + * performance-tests/RTCorba/Oneways/Reliable/Makefile: + * performance-tests/Sequence_Latency/DII/Makefile: + * performance-tests/Sequence_Latency/DSI/Makefile: + * performance-tests/Sequence_Latency/Deferred/Makefile: + + Added missing libraries to the link line. This is necessary + since the DynamicInterface library depends on the Messaging + library. + + * tests/OBV/Supports/Supports_Test_impl.cpp: + * tests/Xt_Stopwatch/Stopwatch_display.h: + + Fixed compilation problems. These showed up only in builds which + used MPC. + + * tao/Messaging/Asynch_Timeout_Handler.cpp: + * tao/Messaging/Asynch_Timeout_Handler.h: + * tao/Messaging/Messaging.cpp: + * tao/Messaging/Messaging.h: + + Cosmetic fixes to get them compiling in minimum_corba builds. + + * tao/Messaging/Messaging.mpc: + + Added the list of files in the project. + Thu Oct 30 22:57:43 2003 Balachandran Natarajan * orbsvcs/examples/ORT/Makefile: diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile index 91545d9156b..2b1911da8bc 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile @@ -69,7 +69,7 @@ endif # cxx .PRECIOUS: cubitC.cpp cubitS.cpp cubitC.h cubitS.h client: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) $(VLDLIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) -lTAO_Valuetype $(VLDLIBS) $(POSTLINK) ../IDL_Cubit/server: cd ../IDL_Cubit; $(MAKE) BIN=server diff --git a/TAO/performance-tests/Latency/DII/Makefile b/TAO/performance-tests/Latency/DII/Makefile index ae1e0d1bb73..cc0243cbc87 100644 --- a/TAO/performance-tests/Latency/DII/Makefile +++ b/TAO/performance-tests/Latency/DII/Makefile @@ -49,7 +49,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_DynamicInterface -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) diff --git a/TAO/performance-tests/Latency/DSI/Makefile b/TAO/performance-tests/Latency/DSI/Makefile index b0b123374c5..864da02b5e0 100644 --- a/TAO/performance-tests/Latency/DSI/Makefile +++ b/TAO/performance-tests/Latency/DSI/Makefile @@ -46,7 +46,7 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) server: $(addprefix $(VDIR),$(SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_DynamicInterface -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Strategies $(TAO_CLNT_VT_LIBS) $(POSTLINK) diff --git a/TAO/performance-tests/Latency/Deferred/Makefile b/TAO/performance-tests/Latency/Deferred/Makefile index 5959196c6da..f1de8a1025b 100644 --- a/TAO/performance-tests/Latency/Deferred/Makefile +++ b/TAO/performance-tests/Latency/Deferred/Makefile @@ -49,7 +49,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_DynamicInterface -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile index 23a26ff3b01..5dff5a440be 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile @@ -50,10 +50,10 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: $(foreach ext, $(IDL_EXT), test$(ext)) server: $(addprefix $(VDIR),$(SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging $(TAO_CLNT_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Messaging -lTAO_Valuetype $(TAO_CLNT_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), test$(ext)) diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile b/TAO/performance-tests/Sequence_Latency/DII/Makefile index 4f9b50ba6f4..fc99b04f4fa 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/Makefile +++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile @@ -49,7 +49,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_DynamicInterface -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile b/TAO/performance-tests/Sequence_Latency/DSI/Makefile index 6d2f406b4fe..92ca0ac1204 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile +++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile @@ -46,7 +46,7 @@ include $(TAO_ROOT)/taoconfig.mk .PRECIOUS: $(foreach ext, $(IDL_EXT), Test$(ext)) server: $(addprefix $(VDIR),$(SERVER_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_DynamicInterface -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Strategies $(TAO_CLNT_VT_LIBS) $(POSTLINK) diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile index 9dc65917b5f..3d0d77ae3b3 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile +++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile @@ -49,7 +49,7 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) - $(LINK.cc) $(LDFLAGS) -o $@ $^ -lTAO_DynamicInterface -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) + $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_DYNAMIC_LIBS) -lTAO_Strategies $(TAO_SRVR_LIBS) $(POSTLINK) realclean: clean -$(RM) $(foreach ext, $(IDL_EXT), Test$(ext)) diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp index 386c5e4f333..29f3b80c1f6 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp @@ -9,7 +9,6 @@ ACE_RCSID(tao, Asynch_Timeout_Handler, "$Id$") -#if (TAO_HAS_AMI_CALLBACK == 1) TAO_Asynch_Timeout_Handler::TAO_Asynch_Timeout_Handler ( TAO_Asynch_Reply_Dispatcher_Base *rd, @@ -67,4 +66,3 @@ TAO_Asynch_Timeout_Handler::cancel () } } -#endif /* (TAO_HAS_AMI_CALLBACK == 1) */ diff --git a/TAO/tao/Messaging/Asynch_Timeout_Handler.h b/TAO/tao/Messaging/Asynch_Timeout_Handler.h index 881e65e8114..be230bb6374 100644 --- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h +++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h @@ -28,8 +28,6 @@ #include "tao/orbconf.h" #include "tao/Basic_Types.h" -#if (TAO_HAS_AMI_CALLBACK == 1) - #include "ace/Event_Handler.h" class TAO_Asynch_Reply_Dispatcher_Base; @@ -75,8 +73,6 @@ public: ACE_Reactor *reactor_; }; -#endif /* (TAO_HAS_AMI_CALLBACK == 1)*/ - #include /**/ "ace/post.h" #endif /* TAO_ASYNCH_TIMEOUT_HANDLER_H */ diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index 47ead2e29b5..b0877afef53 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -64,7 +64,6 @@ TAO_Messaging_Initializer::init (void) return 0; } -#if (TAO_HAS_AMI_CALLBACK == 1) void TAO_Messaging_Helper:: exception_holder_raise (TAO::Exception_Data *exception_data, @@ -156,4 +155,3 @@ exception_holder_raise (TAO::Exception_Data *exception_data, CORBA::COMPLETED_YES)); } -#endif /* TAO_HAS_AMI_CALLBACK */ diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index d6645dbc8cd..7b5ce37f55d 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -69,8 +69,6 @@ enum TAO_AMI_Reply_Status }; -#if (TAO_HAS_AMI_CALLBACK == 1) - typedef void (*TAO_Reply_Handler_Skeleton)( TAO_InputCDR &, Messaging::ReplyHandler_ptr, @@ -103,7 +101,6 @@ namespace TAO_Messaging_Helper ACE_ENV_ARG_DECL); } -#endif /* TAO_HAS_AMI_CALLBACK */ #include /**/ "ace/post.h" #endif /* TAO_MESSAGING_H */ diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 25f9f55a596..955cf8fe6fe 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -2,4 +2,22 @@ project : taolib, core, portableserver { sharedname = TAO_Messaging dynamicflags = TAO_MESSAGING_BUILD_DLL include_dir = tao/Messaging + + Source_Files { + Asynch_Invocation_Adapter.cpp + Asynch_Invocation.cpp + Asynch_Reply_Dispatcher.cpp + Asynch_Timeout_Handler.cpp + Connection_Timeout_Policy_i.cpp + Messaging.cpp + MessagingC.cpp + MessagingS.cpp + Messaging_No_ImplC.cpp + Messaging_RT_PolicyC.cpp + Messaging_SyncScope_PolicyC.cpp + TAO_ExtC.cpp + Messaging_ORBInitializer.cpp + Messaging_PolicyFactory.cpp + Messaging_Policy_i.cpp + } } diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index 10e02d22528..9193b1007db 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -2,7 +2,7 @@ #include "Supports_Test_impl.h" -#include "ace/Streams.h" +#include "ace/Stream.h" /* vt_graph_impl */ @@ -187,9 +187,11 @@ test_impl::start (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::Syst } void -test_impl::finish (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) +test_impl::finish (ACE_ENV_SINGLE_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)) { - this->_remove_ref (); + this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); + ACE_CHECK; } diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h index 5466931e9eb..dd62dd9d5eb 100644 --- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h +++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h @@ -15,7 +15,8 @@ #ifndef STOPWATCH_H #define STOPWATCH_H -#include "tao/corba.h" +#include /**/ "ace/pre.h" +#include "tao/ORB_Constants.h" #if defined (ACE_HAS_XT) @@ -49,4 +50,5 @@ private: #endif /*ACE_HAS_XT*/ +#include /**/ "ace/post.h" #endif /* STOPWATCH_H */ -- cgit v1.2.1