summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2002-08-16 17:34:29 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2002-08-16 17:34:29 +0000
commit7570f06ffa488c2df739326d0849409c101b09bc (patch)
tree903fb2fa1cfd657f443ae5b61e002c77b961c73c
parentfcaed6e4d4c13e70c1456ea9ceb7015cf579bca5 (diff)
downloadATCD-7570f06ffa488c2df739326d0849409c101b09bc.tar.gz
ChangeLogTag:Fri Aug 16 10:25:07 2002 Ossama Othman <ossama@uci.edu>
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLogs/ChangeLog-03a7
-rw-r--r--include/makeinclude/ace_flags.bor4
3 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 645bf0dc125..10f0ec96f2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Aug 16 10:25:07 2002 Ossama Othman <ossama@uci.edu>
+
+ * include/makeinclude/ace_flags.bor:
+
+ Corrected CosLoadBalancing library related variables. They
+ were still setup for use with the old load balancer prototype.
+
Fri Aug 16 11:15:49 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
* examples/Reactor/Proactor/test_aiosig_ace.cpp: Added
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 645bf0dc125..10f0ec96f2b 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Fri Aug 16 10:25:07 2002 Ossama Othman <ossama@uci.edu>
+
+ * include/makeinclude/ace_flags.bor:
+
+ Corrected CosLoadBalancing library related variables. They
+ were still setup for use with the old load balancer prototype.
+
Fri Aug 16 11:15:49 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
* examples/Reactor/Proactor/test_aiosig_ace.cpp: Added
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
index 4a6da127491..13b82b65967 100644
--- a/include/makeinclude/ace_flags.bor
+++ b/include/makeinclude/ace_flags.bor
@@ -53,7 +53,7 @@ TAO_EVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_EVENT_HAS_DLL=$(DLL_FLAG)
TAO_FT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_FT_HAS_DLL=$(DLL_FLAG)
TAO_FTORB_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_FT_HAS_DLL=$(DLL_FLAG)
TAO_LIFECYCLE_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LIFECYCLE_HAS_DLL=$(DLL_FLAG)
-TAO_LOADBALANCING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LOADBALANCING_HAS_DLL=$(DLL_FLAG)
+TAO_COSLOADBALANCING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LOADBALANCING_HAS_DLL=$(DLL_FLAG)
TAO_LOG_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LOG_HAS_DLL=$(DLL_FLAG)
TAO_NAMING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_NAMING_HAS_DLL=$(DLL_FLAG)
TAO_NOTIFY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_NOTIFY_HAS_DLL=$(DLL_FLAG)
@@ -107,7 +107,7 @@ TAO_EVENT_LIB = $(CORE_BINDIR)\TAO_CosEvent$(LIB_DECORATOR).lib
TAO_FT_LIB = $(CORE_BINDIR)\TAO_FaultTolerance$(LIB_DECORATOR).lib
TAO_FTORB_LIB = $(CORE_BINDIR)\TAO_FTORB$(LIB_DECORATOR).lib
TAO_LIFECYCLE_LIB = $(CORE_BINDIR)\TAO_CosLifeCycle$(LIB_DECORATOR).lib
-TAO_LOADBALANCING_LIB = $(CORE_BINDIR)\TAO_LoadBalancing$(LIB_DECORATOR).lib
+TAO_COSLOADBALANCING_LIB = $(CORE_BINDIR)\TAO_CosLoadBalancing$(LIB_DECORATOR).lib
TAO_LOG_LIB = $(CORE_BINDIR)\TAO_DsLogAdmin$(LIB_DECORATOR).lib
TAO_NAMING_LIB = $(CORE_BINDIR)\TAO_CosNaming$(LIB_DECORATOR).lib
TAO_NOTIFY_LIB = $(CORE_BINDIR)\TAO_CosNotification$(LIB_DECORATOR).lib