diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-09-13 08:55:57 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-09-13 08:55:57 +0000 |
| commit | ae47388e9014a0e532fdd5a79438e561456b24fb (patch) | |
| tree | f2e99563b0a26966d68f56407f5f93b8244f53a8 | |
| parent | 355617a708cf3aa3bf78d5b40373bea4765807df (diff) | |
| download | ATCD-ae47388e9014a0e532fdd5a79438e561456b24fb.tar.gz | |
Thu Sep 13 08:55:38 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/config-sunos5.5.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 68f8f624c86..e27d29108f6 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 13 08:55:38 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-sunos5.5.h: + Don't use ACE_HAS_INTEL_ASSEMBLY with GCC + Wed Sep 12 18:02:38 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-win32-borland.h: diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index b9578a212d4..6cf4bea942b 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -118,6 +118,7 @@ // this must appear before its #include. # define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" +# undef ACE_HAS_INTEL_ASSEMBLY # define ACE_HAS_HI_RES_TIMER // Denotes that GNU has cstring.h as standard, to redefine memchr(). # define ACE_HAS_GNU_CSTRING_H @@ -364,11 +365,6 @@ #define ACE_HAS_STL_MAP_CONFLICT -// Sieg - gcc 2.95.1 declares queue in stream.h. Might want to change -// the == to >= to allow for future versions -#if !( __GNUG__ && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95) ) -#define ACE_HAS_STL_QUEUE_CONFLICT -#endif /* !( __GNUG__ && (__GNUC__ == 2) && (__GNUC_MINOR__ == 95) ) */ #define ACE_HAS_IDTYPE_T #define ACE_HAS_GPERF |