summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2002-03-04 07:14:23 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2002-03-04 07:14:23 +0000
commit82c35989a3cce87ede99bdfc4d780131e8852e92 (patch)
treea4a2495e415562261edba4e5691754198dc3aa2a
parent04b14f70dbb0cd1d2e1566943054fdb228b0f5a5 (diff)
downloadATCD-82c35989a3cce87ede99bdfc4d780131e8852e92.tar.gz
ChangeLogTag: Mon Mar 04 09:10:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a13
-rw-r--r--TAO/tao/DynamicInterface/Makefile.bor6
2 files changed, 12 insertions, 7 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 44fa287ded0..5c44c2ed07d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,8 @@
+Mon Mar 4 08:10:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tao/DynamicInterface/Makefile.bor:
+ Removed messaging cflags and added portableserver cflags
+
Sun Mar 3 18:18:08 2002 Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
* tao/Makefile:
@@ -17,7 +22,7 @@ Sun Mar 3 17:48:19 2002 Craig Rodrigues <crodrigu@bbn.com>
* tao/DynamicInterface/Request.h:
Remove include of "tao/Messaging/MessagingC.h"
-
+
* tao/DynamicInterface/Makefile:
* tao/DynamicInterface/Makefile.bor:
Remove TAO_Messaging library.
@@ -37,15 +42,15 @@ Sun Mar 3 16:09:14 2002 Craig Rodrigues <crodrigu@bbn.com>
Add ACE exception handling macros in svc() method.
* orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp:
- Change ACE_ENV_ARG_PARAMETER to
+ Change ACE_ENV_ARG_PARAMETER to
ACE_SINGLE_ENV_ARG_PARAMETER in call to policy_list->destroy().
Sun Mar 3 10:20:23 2002 Craig Rodrigues <crodrigu@bbn.com>
* orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp:
Add ACE_TYPENAME to RIR_Narrow<Interface>::resolve()
- to eliminate gcc 3.1 warning:
- "typename RIR_Narrow<Interface>::Interface_ptr'
+ to eliminate gcc 3.1 warning:
+ "typename RIR_Narrow<Interface>::Interface_ptr'
is implicitly a typename"
Sun Mar 3 10:19:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>
diff --git a/TAO/tao/DynamicInterface/Makefile.bor b/TAO/tao/DynamicInterface/Makefile.bor
index 2d11eac38a1..673028f6f6d 100644
--- a/TAO/tao/DynamicInterface/Makefile.bor
+++ b/TAO/tao/DynamicInterface/Makefile.bor
@@ -18,9 +18,9 @@ OBJFILES = \
RESOURCE = $(OBJDIR)\TAO_DynamicInterface.res
!ifdef STATIC
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICINTERFACE_CFLAGS) $(TAO_MESSAGING_CFLAGS)
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICINTERFACE_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS)
!else
-CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICINTERFACE_CFLAGS) $(TAO_MESSAGING_CFLAGS) \
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_DYNAMICINTERFACE_CFLAGS) $(TAO_PORTABLESERVER_CFLAGS) \
-DTAO_DYNAMICINTERFACE_BUILD_DLL
!endif
@@ -32,6 +32,6 @@ INCLUDES = *.h *.inl
LIBFILES = \
$(ACE_LIB) \
$(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB)
+ $(TAO_PORTABLESERVER_LIB)
!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>