diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-08-31 19:58:31 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-08-31 19:58:31 +0000 |
| commit | 51d82c93287213869281e881d9bd338317dc90bf (patch) | |
| tree | e5f6359bd173d8a34e1f63b6d5b5b8e344c90c80 | |
| parent | 34c6e749ee65fc9cdff3f327fbf2f7feccdc1bca (diff) | |
| download | ATCD-51d82c93287213869281e881d9bd338317dc90bf.tar.gz | |
ChangeLogTag: Sat Aug 31 14:54:01 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/Adapter.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/Messaging/Makefile | 10 |
3 files changed, 18 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f561a8c02c4..f06eec12851 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Aug 31 14:54:01 2002 Balachandran Natarajan <bala@isis-server.vuse.vanderbilt.edu> + + * tao/Adapter.cpp: #included debug.h + * tao/Messaging/Makefile: Do not compile if corba_messaging=0. + + Thanks to Cemal Yilmaz <cyilmaz@cs.umd.edu> and the 'skoll' + experiment for finding and reporting it. Apparently the error in + tao/Adapter.cpp is being signalled by our scoreboard too. + Sat Aug 31 15:59:07 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> * tests/RTCORBA/Server_Protocol/server.cpp: diff --git a/TAO/tao/Adapter.cpp b/TAO/tao/Adapter.cpp index 19eacac66c0..c5951915b33 100644 --- a/TAO/tao/Adapter.cpp +++ b/TAO/tao/Adapter.cpp @@ -7,6 +7,7 @@ #include "tao/ORB_Core.h" #include "tao/ORB.h" #include "ace/Dynamic_Service.h" +#include "debug.h" #if !defined (__ACE_INLINE__) # include "Adapter.i" diff --git a/TAO/tao/Messaging/Makefile b/TAO/tao/Messaging/Makefile index a7175395049..0c0b20539c6 100644 --- a/TAO/tao/Messaging/Makefile +++ b/TAO/tao/Messaging/Makefile @@ -9,8 +9,8 @@ endif # ! TAO_ROOT MAKEFILE = Makefile LIBNAME = libTAO_Messaging -LIB = $(LIBNAME).a -SHLIB = $(LIBNAME).$(SOEXT) +LIB_UNCHECKED = $(LIBNAME).a +SHLIB_UNCHECKED = $(LIBNAME).$(SOEXT) ACE_SHLIBS = -lTAO_PortableServer -lTAO -lACE @@ -38,6 +38,12 @@ LSRC = $(addsuffix .cpp,$(FILES)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU + +ifeq ($(corba_messaging),1) +LIB=$(LIB_UNCHECKED) +SHLIB=$(SHLIB_UNCHECKED) +endif # corba_messaging + include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU |