diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-23 18:21:59 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-23 18:21:59 +0000 |
| commit | 10f8027d890f0ae611440ed9a68ee690a2787ef2 (patch) | |
| tree | 378bf2526c1882a83c10a018752bfe23b1763c14 /ace | |
| parent | 59f7f44469395ee8c6020125e44666b9cdce4ff7 (diff) | |
| download | ATCD-10f8027d890f0ae611440ed9a68ee690a2787ef2.tar.gz | |
ChangeLogTag:Wed Jul 23 18:03:21 UTC 2003 Don Hinton <dhinton@dresystems.com>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/String_Base.cpp | 4 | ||||
| -rw-r--r-- | ace/config-cygwin32.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ace/String_Base.cpp b/ace/String_Base.cpp index 43e457d24fc..22055b4756a 100644 --- a/ace/String_Base.cpp +++ b/ace/String_Base.cpp @@ -6,10 +6,6 @@ #include "ace/String_Base.h" #include "ace/Auto_Ptr.h" -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) -# include "ace/streams.h" -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ - #if !defined (__ACE_INLINE__) #include "ace/String_Base.i" #endif /* __ACE_INLINE__ */ diff --git a/ace/config-cygwin32.h b/ace/config-cygwin32.h index 9706da12267..5b60d59262e 100644 --- a/ace/config-cygwin32.h +++ b/ace/config-cygwin32.h @@ -175,6 +175,12 @@ # define ACE_LACKS_PTHREAD_CANCEL #endif /* ACE_MT_SAFE */ +// Include math.h here so that it will be included before ACE.h. math.h defines +// a macro log2 that conflicts with ACE::log2() which seems to only cause a +// problem on cygwin. Insuring that math.h is included first solves it since +// ACE.h defines acelog2 as log2, then undefines log2. +#include "ace/os_include/os_math.h" + #include /**/ "ace/post.h" #endif /* ACE_CONFIG_CYGWIN32_H */ |