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 | 265473aac2c3804a357a8c67b28278e9a85d66d6 (patch) | |
| tree | f2e99563b0a26966d68f56407f5f93b8244f53a8 /ACE/ace/config-sunos5.5.h | |
| parent | bacca9b4c91574f0a755c7d4e8d9479ba9752a81 (diff) | |
| download | ATCD-265473aac2c3804a357a8c67b28278e9a85d66d6.tar.gz | |
Thu Sep 13 08:55:38 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/config-sunos5.5.h')
| -rw-r--r-- | ACE/ace/config-sunos5.5.h | 6 |
1 files changed, 1 insertions, 5 deletions
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 |