diff options
| author | sbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-04-23 17:39:46 +0000 |
|---|---|---|
| committer | sbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-04-23 17:39:46 +0000 |
| commit | 7a1a086b939bc5e2ab4d8b1afb887ea847720dd7 (patch) | |
| tree | 2602b3632a41232b651bc272bf2b346d7fdf9baf | |
| parent | f14b71718cbf1029816ffa2fc234e47e4c7855b3 (diff) | |
| download | ATCD-7a1a086b939bc5e2ab4d8b1afb887ea847720dd7.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/orbsvcs/tests/Trading_Service/Makefile | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp | 16 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp | 1 |
3 files changed, 20 insertions, 2 deletions
diff --git a/TAO/orbsvcs/tests/Trading_Service/Makefile b/TAO/orbsvcs/tests/Trading_Service/Makefile index d25ba619994..6b29fdafda1 100644 --- a/TAO/orbsvcs/tests/Trading_Service/Makefile +++ b/TAO/orbsvcs/tests/Trading_Service/Makefile @@ -43,6 +43,7 @@ LDFLAGS += -L$(STL_ROOT)/lib #---------------------------------------------------------------------------- # Local macros #---------------------------------------------------------------------------- + shared_libs_only=1 BIN = export_test import_test colocated_test @@ -68,6 +69,10 @@ LSRC = $(addsuffix .cpp,$(FILES)) LDLIBS = -lTTest -lorbsvcs -lospace -lTAO VLDLIBS = $(LDLIBS:%=%$(VAR)) +ifdef dynamic_properties +CPPFLAGS += -DTAO_USE_DYNAMIC_PROPERTIES +endif + #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp index 2257b3e1d7f..f3a5bfb4fb0 100644 --- a/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading_Service/Offer_Exporter.cpp @@ -265,9 +265,12 @@ TAO_Offer_Exporter::create_offers (void) CORBA::Any extra_info; TAO_Sequences::StringSeq string_seq (QUEUE_SIZE); TAO_Sequences::ULongSeq ulong_seq (QUEUE_SIZE); + +#ifdef TAO_USE_DYNAMIC_PROPERTIES CosTradingDynamic::DynamicProp* dp_user_queue; CosTradingDynamic::DynamicProp* dp_file_queue; - +#endif /* TAO_USE_DYNAMIC_PROPERTIES */ + // Initialize plotters string_seq.length (QUEUE_SIZE); ulong_seq.length (QUEUE_SIZE); @@ -283,6 +286,8 @@ TAO_Offer_Exporter::create_offers (void) string_seq[j] = TT_Info::USERS [counter]; ulong_seq[j] = counter * 10000; } + +#ifdef TAO_USE_DYNAMIC_PROPERTIES dp_user_queue = this->dp_plotters_[i].construct_dynamic_prop (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE], @@ -303,8 +308,12 @@ TAO_Offer_Exporter::create_offers (void) (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING], new Simple_DP_Evaluation_Handler<TAO_Sequences::ULongSeq> (ulong_seq), CORBA::B_TRUE); - + this->props_plotters_[i].length (9); +#else + this->props_plotters_[i].length (7); +#endif /* TAO_USE_DYNAMIC_PROPERTIES */ + this->props_plotters_[i][0].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME]); this->props_plotters_[i][0].value <<= CORBA::string_dup (name); this->props_plotters_[i][1].name = CORBA::string_dup (TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::LOCATION]); @@ -319,10 +328,13 @@ TAO_Offer_Exporter::create_offers (void) this->props_plotters_[i][5].value <<= (CORBA::Float) i; this->props_plotters_[i][6].name = CORBA::string_dup (TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_MODEL_NUMBER]); this->props_plotters_[i][6].value <<= CORBA::string_dup (TT_Info::MODEL_NUMBERS[i]); + +#ifdef TAO_USE_DYNAMIC_PROPERTIES this->props_plotters_[i][7].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_USER_QUEUE]; this->props_plotters_[i][7].value <<= *dp_user_queue; this->props_plotters_[i][8].name = TT_Info::PLOTTER_PROPERTY_NAMES[TT_Info::PLOTTER_FILE_SIZES_PENDING]; this->props_plotters_[i][8].value <<= *dp_file_queue; +#endif /* TAO_USE_DYNAMIC_PROPERTIES */ } // Initialize printers diff --git a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp index 4b0d5643297..50fee229a45 100644 --- a/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading_Service/Offer_Importer.cpp @@ -26,6 +26,7 @@ TAO_Offer_Importer::perform_queries (CORBA::Environment& _env) TAO_Policy_Manager policies; CosTrading::Lookup::SpecifiedProps desired_props; + desired_props._d (CosTrading::Lookup::all); policies.exact_type_match (CORBA::B_FALSE); policies.search_card (4*NUM_OFFERS); policies.match_card (4*NUM_OFFERS); |