summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-29 17:57:21 +0000
committermk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-05-29 17:57:21 +0000
commitda87d374da8fe12b0d7dbe3ab3788d6689695075 (patch)
tree4fc52310c0375f36e3a6c2f1508423da2aee5415
parent08e29c5c7ae82b9166d130e221b4dadba6048e54 (diff)
downloadATCD-da87d374da8fe12b0d7dbe3ab3788d6689695075.tar.gz
ChangeLog entry: Fri May 29 13:00:35 1998 Michael Kircher <mk1@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-98c5
-rw-r--r--TAO/tests/Quoter/Factory_Trader.cpp3
-rw-r--r--TAO/tests/Quoter/Makefile3
3 files changed, 11 insertions, 0 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 00289649a3b..4cda42e5448 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Fri May 29 13:00:35 1998 Michael Kircher <mk1@cs.wustl.edu>
+
+ * tests/Quoter/Factory_Trader.cpp: CosTradingC.h is only
+ parsed when the trading service is available.
+
Fri May 29 11:02:35 1998 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu>
* tao/orbconf.h: Removed an unnecessary OR condition for the
diff --git a/TAO/tests/Quoter/Factory_Trader.cpp b/TAO/tests/Quoter/Factory_Trader.cpp
index 65681e0a9ee..a62e3846123 100644
--- a/TAO/tests/Quoter/Factory_Trader.cpp
+++ b/TAO/tests/Quoter/Factory_Trader.cpp
@@ -11,6 +11,7 @@
// the functionality provided is used. This class serves
// as Wrapper around the Trading Service and provides
// smaller interfaces.
+// TRADER_AVAILABLE is defined via compiler switch in the Makefile
//
// = AUTHOR
// Michael Kircher (mk1@cs.wustl.edu)
@@ -18,7 +19,9 @@
// ============================================================================
#include "Factory_Trader.h"
+#ifdef TRADER_AVAILABLE
#include "orbsvcs/CosTradingC.h"
+#endif // TRADER_AVAILABLE
// This const char * is used for adding a new type to the service repository
// the added types will be subclasses of this.
diff --git a/TAO/tests/Quoter/Makefile b/TAO/tests/Quoter/Makefile
index 161d241a04c..7e41384924c 100644
--- a/TAO/tests/Quoter/Makefile
+++ b/TAO/tests/Quoter/Makefile
@@ -45,6 +45,9 @@ endif # trader
BIN = client server Factory_Finder Generic_Factory Life_Cycle_Service
+# The following lines tell the souce code that the trading
+# service is available.
+
ifdef trader
CPPFLAGS += -DTRADER_AVAILABLE