diff options
| -rw-r--r-- | ChangeLog-99b | 10 | ||||
| -rw-r--r-- | ace/Based_Pointer_T.cpp | 2 | ||||
| -rw-r--r-- | ace/OS.h | 14 |
3 files changed, 18 insertions, 8 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index fbc6e0957e5..b662ae3e72c 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,3 +1,13 @@ +Sun Aug 1 10:03:56 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace/OS.h: Moved the definition of ACE_IPPROTO_TCP down + further in this file so that the IPPROTO_TCP macro would be + defined. + + * ace/Based_Pointer_T.cpp: Removed an inappropriate use of + ACE_INLINE in the *.cpp file. Thanks to DEC UNIX C++ for + reporting this! + Sun Aug 01 02:41:44 1999 Nanbor Wang <nanbor@cs.wustl.edu> * examples/Shared_Malloc/Shared_Malloc.dsw diff --git a/ace/Based_Pointer_T.cpp b/ace/Based_Pointer_T.cpp index fefe3421b32..ec469c31f91 100644 --- a/ace/Based_Pointer_T.cpp +++ b/ace/Based_Pointer_T.cpp @@ -13,7 +13,7 @@ #include "ace/Based_Pointer_T.i" #endif /* __ACE_INLINE__ */ -template <class CONCRETE> ACE_INLINE +template <class CONCRETE> ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer (void) { ACE_TRACE ("ACE_Based_Pointer<CONCRETE>::ACE_Based_Pointer"); @@ -26,12 +26,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -# if defined (ACE_HAS_PHARLAP_RT) -#define ACE_IPPROTO_TCP SOL_SOCKET -# else -#define ACE_IPPROTO_TCP IPPROTO_TCP -# endif /* ACE_HAS_PHARLAP_RT */ - #if !defined (ACE_MALLOC_ALIGN) #define ACE_MALLOC_ALIGN ((int) sizeof (long)) #endif /* ACE_MALLOC_ALIGN */ @@ -4541,7 +4535,7 @@ typedef void (*ACE_CLEANUP_FUNC)(void *object, void *param) /* throw () */; } # endif /* ACE_HAS_SIG_C_FUNC */ -// For use by ACE_OS::exit (). +// For use by <ACE_OS::exit>. extern "C" { typedef void (*ACE_EXIT_HOOK) (); @@ -4831,6 +4825,12 @@ private: // <ACE_Thread_Manager>. }; +# if defined (ACE_HAS_PHARLAP_RT) +#define ACE_IPPROTO_TCP SOL_SOCKET +# else +#define ACE_IPPROTO_TCP IPPROTO_TCP +# endif /* ACE_HAS_PHARLAP_RT */ + # if defined (ACE_LACKS_FLOATING_POINT) typedef ACE_UINT32 ACE_timer_t; # else |