diff options
| author | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-07-19 04:13:04 +0000 |
|---|---|---|
| committer | crodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-07-19 04:13:04 +0000 |
| commit | 4b71ea90355328465d729d66ab82f7b38978044a (patch) | |
| tree | b54e7184c1dce4aa87f0788d603e7aae90db1fa1 | |
| parent | 6982631e1a79cc7c463ad631223aa9f1122eea4f (diff) | |
| download | ATCD-4b71ea90355328465d729d66ab82f7b38978044a.tar.gz | |
ChangeLogTag: Wed Jul 18 23:58:00 2001 Craig Rodrigues <crodrigu@bbn.com>
5 files changed, 23 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index cbcaeb0506d..021a1650f32 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,19 @@ +Wed Jul 18 23:58:00 2001 Craig Rodrigues <crodrigu@bbn.com> + + * orbsvcs/tests/AVStreams/Component_Switching/sender.cpp: + * orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp: + * orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp: + + Add #include "tao/Strategies/advanced_resource.h" + so that the ace_static_svc_TAO_Advanced_Resource_Factory + symbol is defined in each binary, and the TAO_Strategies + library is actually linked in during static builds. + Fixes failures of this test with static builds. + + * orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf: + Fix syntax so Service Configurator file can be used + for static and dynamic builds. + Wed Jul 18 19:22:48 2001 Irfan Pyarali <irfan@cs.wustl.edu> * tao/Leader_Follower.i (set/reset_client_leader_thread): Fixed a diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf b/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf index 1987d3d81c6..05579a12523 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/components_svc.conf @@ -4,6 +4,5 @@ # This configuration file is used to use only the default TAO # strategies -dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType select_mt" - +static Advanced_Resource_Factory "-ORBReactorType select_mt" diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index 51b1e06a136..a3c6579f6be 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -6,6 +6,8 @@ #include "orbsvcs/AV/Protocol_Factory.h" #include "orbsvcs/AV/FlowSpec_Entry.h" +#include "tao/Strategies/advanced_resource.h" + typedef ACE_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER; // constructor. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index 1968b4a7b54..a33af2bec29 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -4,6 +4,8 @@ #include "ace/Get_Opt.h" #include "tao/debug.h" +#include "tao/Strategies/advanced_resource.h" + static FILE *output_file = 0; /// File handle of the file into which received data is written. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index f806fd5f7db..71588022d7c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -6,6 +6,8 @@ #include "ace/High_Res_Timer.h" #include "ace/Event_Handler.h" +#include "tao/Strategies/advanced_resource.h" + typedef ACE_Singleton<Sender, ACE_Null_Mutex> SENDER; /// Create a singleton instance of the Sender. |