diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-13 17:48:26 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-13 17:48:26 +0000 |
| commit | 08917ff956e649525c01d086b4bb1eeabe7d1462 (patch) | |
| tree | 0dd6da2b8de390f1d7092a5ece120f1f2f5b3fdb | |
| parent | 95b0caf7f2730d0de639dab8aa815f9c3c699a50 (diff) | |
| download | ATCD-08917ff956e649525c01d086b4bb1eeabe7d1462.tar.gz | |
ChangeLogTag:Thu Nov 13 17:37:04 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | ace/DEV_Addr.cpp | 7 | ||||
| -rw-r--r-- | ace/DEV_Addr.i | 4 | ||||
| -rw-r--r-- | ace/SString.i | 7 |
4 files changed, 26 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index ac52df07f54..39ec52b3fed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Thu Nov 13 17:37:04 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * ace/DEV_Addr.{cpp,i}: + Moved #include os_socket.h from .cpp to .i since it is needed + there, removed #include SString.h from .i and added + OS_NS_string.h and Global_Macros.h, then moved the #include's in + .cpp to below the #include of .i so that the inlined and + non-inlined builds would behave the same. + + * ace/SString.i: + Added #include ACE.h if not already included, e.g., when + ACE_TEMPLATES_REQUIRE_SOURCE isn't defined. + Thu Nov 13 17:39:19 UTC 2003 Craig Rodrigues <crodrigu@bbn.com> * ace/config-freebsd.h: diff --git a/ace/DEV_Addr.cpp b/ace/DEV_Addr.cpp index a6100ec0565..4166c812c63 100644 --- a/ace/DEV_Addr.cpp +++ b/ace/DEV_Addr.cpp @@ -2,14 +2,13 @@ // $Id$ #include "ace/DEV_Addr.h" -#include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" -#include "ace/os_include/sys/os_socket.h" - #if !defined (__ACE_INLINE__) #include "ace/DEV_Addr.i" #endif /* __ACE_INLINE__ */ +#include "ace/Log_Msg.h" +#include "ace/OS_NS_string.h" + ACE_RCSID(ace, DEV_Addr, "$Id$") ACE_ALLOC_HOOK_DEFINE(ACE_DEV_Addr) diff --git a/ace/DEV_Addr.i b/ace/DEV_Addr.i index 3be347d99b9..e1f8d8ff995 100644 --- a/ace/DEV_Addr.i +++ b/ace/DEV_Addr.i @@ -1,7 +1,9 @@ /* -*- C++ -*- */ // $Id$ -#include "ace/SString.h" +#include "ace/OS_NS_string.h" +#include "ace/Global_Macros.h" +#include "ace/os_include/sys/os_socket.h" ACE_INLINE void ACE_DEV_Addr::set (const ACE_TCHAR *devname) diff --git a/ace/SString.i b/ace/SString.i index ec5f1850d07..3c17ddca7a6 100644 --- a/ace/SString.i +++ b/ace/SString.i @@ -2,6 +2,13 @@ // // $Id$ +// Include ACE.h only if it hasn't already been included, e.g., if +// ACE_TEMPLATES_REQUIRE_SOURCE, ACE.h won't have been pulled in by +// String_Base.cpp. +#ifndef ACE_ACE_H +# include "ace/ACE.h" +#endif /* !ACE_ACE_H */ + ACE_INLINE ACE_NS_WString::ACE_NS_WString (ACE_Allocator *alloc) : ACE_WString (alloc) |