diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-15 20:11:01 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-15 20:11:01 +0000 |
| commit | f8f493d159e6826abf6221e4946893c2d774b5b3 (patch) | |
| tree | 5969db29b7be01d50ebcf3f29a122a81076ebcc2 | |
| parent | 66529fb574b1719879461badb1b6aac32399e5ac (diff) | |
| download | ATCD-f8f493d159e6826abf6221e4946893c2d774b5b3.tar.gz | |
ChangeLogTag: Wed Nov 15 19:08:39 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/config-lite.h | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index e9e66169c3f..39657a50121 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Wed Nov 15 19:08:39 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/config-lite.h: + + Changed to not include <Cstd/stdcomp.h> on Solaris systems + when using the stlport4 C++ library. + Wed Nov 15 15:33:10 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * apps/JAWS/clients/Caching/caching.mpc: diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index e36f2c525a5..343ae136ca1 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -122,9 +122,11 @@ ACE_END_VERSIONED_NAMESPACE_DECL // Once all C++ compilers support the standard reverse_iterator // adapters, we can drop this generator macro or at least drop the // MSVC++ or Sun Studio preprocessor conditional blocks. -#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580 - // We need to ensure that this is included in order to test - // _RWSTD_NO_CLASS_PARTIAL_SPEC below +#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x580 \ + && !defined (_STLPORT_VERSION) + // If we're not using the stlport4 C++ library (which has standard + // iterators), we need to ensure this is included in order to test + // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below. # include <Cstd/stdcomp.h> #endif /* __SUNPRO_CC <= 0x580 */ #if defined (_MSC_VER) && !defined (_CPPLIB_VER) |