From 4151987cb4657192ad1a9141ef5f88c5a5e6d4d5 Mon Sep 17 00:00:00 2001 From: coryan Date: Sat, 10 Mar 2001 19:49:11 +0000 Subject: ChangeLogTag:Sat Mar 10 11:46:28 2001 Carlos O'Ryan --- TAO/ChangeLogs/ChangeLog-02a | 36 +++++++++++++++++----- TAO/orbsvcs/examples/RtEC/MCast/Makefile | 2 +- TAO/orbsvcs/tests/AVStreams/Latency/Makefile | 2 +- TAO/orbsvcs/tests/CosEvent/Basic/Makefile | 2 +- TAO/orbsvcs/tests/CosEvent/lib/Makefile | 4 +-- TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile | 2 +- TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp | 15 +++------ TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h | 6 ++-- .../tests/FaultTolerance/IOGRManipulation/Makefile | 2 +- .../Notify/performance-tests/RedGreen/Makefile | 2 +- .../Notify/performance-tests/Throughput/Makefile | 2 +- TAO/orbsvcs/tests/Sched/Makefile | 2 +- 12 files changed, 46 insertions(+), 31 deletions(-) (limited to 'TAO') diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index ec07eb00512..3dfa8a7e027 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,19 +1,39 @@ +Sat Mar 10 11:46:28 2001 Carlos O'Ryan + + * examples/RtEC/MCast/Makefile: + * tests/AVStreams/Latency/Makefile: + * tests/CosEvent/Basic/Makefile: + * tests/CosEvent/lib/Makefile: + * tests/EC_Custom_Marshal/Makefile: + * tests/FaultTolerance/IOGRManipulation/Makefile: + * tests/Notify/performance-tests/RedGreen/Makefile: + * tests/Notify/performance-tests/Throughput/Makefile: + * tests/Sched/Makefile: + More fixes to make QNX happy about the library + interdependencies. + + * tests/FaultTolerance/IOGR/Manager.h: + * tests/FaultTolerance/IOGR/Manager.cpp: + Do not return anything from Manager::init(), exceptions are + raised to indicate errors, and the return value was ignored + anyway. + Sat Mar 10 11:29:16 2001 Balachandran Natarajan - * examples/Simple/echo/Echo_i.cpp: Fixed a compile error in debian - Linux. + * examples/Simple/echo/Echo_i.cpp: Fixed a compile error in debian + Linux. Sat Mar 10 09:39:45 2001 Balachandran Natarajan - * Reverted the change made by Paul Calabrese vide "Fri Mar 9 - 14:38:06 2001 Paul Calabrese ". This - change was breaking all the tests for Sequences in - $TAO_ROOT/tests/Param_Test. + * Reverted the change made by Paul Calabrese vide "Fri Mar 9 + 14:38:06 2001 Paul Calabrese ". This + change was breaking all the tests for Sequences in + $TAO_ROOT/tests/Param_Test. Sat Mar 10 02:33:13 2001 Carlos O'Ryan - * tests/Makefile: - Add the new test to the recursive Makefiles + * tests/Makefile: + Add the new test to the recursive Makefiles Sat Mar 10 02:09:29 2001 Carlos O'Ryan diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile b/TAO/orbsvcs/examples/RtEC/MCast/Makefile index eb0eacd4fdd..5dadd4da79e 100644 --- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile +++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile @@ -15,7 +15,7 @@ endif # ! TAO_ROOT BIN2 = MCast SRC=MCast.cpp Consumer.cpp Supplier.cpp AddrServer.cpp -LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile index e4312002129..4c71a285adb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile +++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile @@ -6,7 +6,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_PortableServer -lTAO +LDLIBS = -lTAO_AV -lTAO_CosProperty -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile index 02b67dd094d..a9981bbe40d 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Makefile +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Makefile @@ -21,7 +21,7 @@ BIN2 = \ Random PSRC=$(addsuffix .cpp,$(BIN2)) -LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO +LDLIBS = -lCECTests -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Makefile b/TAO/orbsvcs/tests/CosEvent/lib/Makefile index 68e4964385d..a39d45dd1f4 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Makefile +++ b/TAO/orbsvcs/tests/CosEvent/lib/Makefile @@ -19,8 +19,8 @@ ifeq (NativeCosEvent,$(findstring NativeCosEvent,$(TAO_ORBSVCS))) SHLIB = $(SHLIB2) endif # NativeCosEvent -ACE_SHLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE -LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO +ACE_SHLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO -lACE +LDLIBS = -lTAO_CosEvent -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO SRCS = Counting_Consumer Counting_Supplier FILES = $(SRCS) diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile index e95f013b839..4b925756879 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile @@ -1,6 +1,6 @@ # $Id$ -LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO +LDLIBS= -lTAO_RTEvent -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index 6476cc9b2ab..00f059b858e 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -115,8 +115,7 @@ Manager::Manager (void) //no-op } - -int +void Manager::init (int argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) @@ -125,7 +124,7 @@ Manager::init (int argc, argv, 0, ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); + ACE_CHECK; // Obtain the RootPOA. CORBA::Object_var obj_var = @@ -136,21 +135,17 @@ Manager::init (int argc, // Get the POA_var object from Object_var. PortableServer::POA_var root_poa_var = PortableServer::POA::_narrow (obj_var.in (), ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); + ACE_CHECK; // Get the POAManager of the RootPOA. PortableServer::POAManager_var poa_manager_var = root_poa_var->the_POAManager (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); + ACE_CHECK; poa_manager_var->activate (ACE_TRY_ENV); - ACE_CHECK_RETURN (-1); - - return 0; + ACE_CHECK; } - - int Manager::make_merged_iors (CORBA::Environment &ACE_TRY_ENV) { diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h index f204395c057..8c6099b29e1 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h @@ -42,9 +42,9 @@ public: Manager (void); // Ctor - int init (int argc, - char *argv[], - CORBA::Environment & ACE_TRY_ENV); + void init (int argc, + char *argv[], + CORBA::Environment & ACE_TRY_ENV); // Initialize the ORB, POA etc. diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile index 6396e89806a..3780cc44bcc 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lTAO_FaultTolerance -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORManip -lTAO +LDLIBS = -lTAO_FaultTolerance -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_IORManip -lTAO PROG_SRCS = IOGRTest.cpp diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile index 1a56c414aad..9523395a7db 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif -LDLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO -lTAO_Svc_Utils +LDLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO LSRC = RedGreen_Test.cpp main.cpp diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile index f180d526c2c..f323def94d8 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile @@ -24,7 +24,7 @@ endif # Naming endif # Notify PSRC=$(addsuffix .cpp,$(BIN)) -LDLIBS += -lNotifyTests -lTAO_CosNotification -lTAO_Svc_Utils -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO +LDLIBS += -lNotifyTests -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO CPPFLAGS += -I../../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc)) diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile index f9a79d3daf8..e1ec8bc89ed 100644 --- a/TAO/orbsvcs/tests/Sched/Makefile +++ b/TAO/orbsvcs/tests/Sched/Makefile @@ -5,7 +5,7 @@ ifndef TAO_ROOT endif SRC = $(BIN:%=%$(VAR).cpp) -LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO +LDLIBS = -lTAO_RTSched -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_PortableServer -lTAO CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched \ -I$(TAO_ROOT)/orbsvcs \ -- cgit v1.2.1