diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-15 16:07:10 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-07-15 16:07:10 +0000 |
| commit | 4b2de65639d6011e90530a53e901f44e818ed7ec (patch) | |
| tree | 655193d31dc1c761285b20a658ec6fe5d8abf6a0 | |
| parent | 56702c1c569aa8e56d5c145528b5b7968140971c (diff) | |
| download | ATCD-4b2de65639d6011e90530a53e901f44e818ed7ec.tar.gz | |
ChangeLogTag: Wed Jul 14 12:34:46 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 9 | ||||
| -rw-r--r-- | TAO/examples/Callback_Quoter/Makefile | 14 |
2 files changed, 8 insertions, 15 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index f7ed84531db..3e07d1e7650 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,6 +1,13 @@ +Wed Jul 14 12:34:46 1999 David L. Levine <levine@cs.wustl.edu> + + * examples/Callback_Quoter/Makefile: reverted + change that disabled on LynxOS. It seems to build + fine, with inlining and debug enabled. See + Wed Jul 14 12:34:46 1999 David L. Levine <levine@cs.wustl.edu> + Thu Jul 15 11:02:57 1999 David L. Levine <levine@cs.wustl.edu> - * examples/Callback_Quoater/Notifier_i.cpp: removed + * examples/Callback_Quoter/Notifier_i.cpp: removed ACE_Hash<ACE_CString> and ACE_Equal_To<ACE_CString> explicit instantiations, because they're in tao/POA.cpp. Thanks to Denis Ouellet <douellet@gel.ulaval.ca> for diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile index 5edb6067866..19535e14030 100644 --- a/TAO/examples/Callback_Quoter/Makefile +++ b/TAO/examples/Callback_Quoter/Makefile @@ -81,18 +81,6 @@ TAO_IDLFLAGS += -Ge 1 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -ifneq (,$(LYNXTARGET)) - - # To avoid this behavior with LynxOS' old g++: - # POA.cpp: multiple definition of - # `ACE_Hash<ACE_CString>::operator()(ACE_CString const &) const' - # .obj/Notifier_i.o:$(ACE_ROOT)/ace/Functor_T.i:38: first defined here - - all clean realclean: - @echo examples/Callback_Quoter is not built on LynxOS - -else # ! LYNXTARGET - include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU @@ -127,8 +115,6 @@ realclean: clean -$(RM) NotifierC.* NotifierS.* NotifierS_T.* \ ConsumerC.* ConsumerS.* ConsumerS_T.* -endif # ! LYNXTARGET - #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- |