diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2011-07-01 08:47:39 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2011-07-01 08:47:39 +0000 |
| commit | da92338f32495c2b31b8f10e55b35306aa6cd31b (patch) | |
| tree | 2c4386b8dfe85fe7ea6163ce2cd25981e663ed18 | |
| parent | 58d10f7747da2bd31681136abdcc0858befe5bd5 (diff) | |
| download | ATCD-da92338f32495c2b31b8f10e55b35306aa6cd31b.tar.gz | |
ChangeLogTag: Fri Jul 1 08:46:30 UTC 2011 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/config-qnx.h | 1 | ||||
| -rw-r--r-- | ACE/ace/config-sunos5.5.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 96953740cdf..e8ba80ac887 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 1 08:46:30 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * ace/config-qnx.h: + * ace/config-sunos5.5.h: + Added ACE_LACKS_STD_WSTRING to remedy compile problems with new + CDR stream ops in TAO. + Wed Jun 29 20:47:33 UTC 2011 Steve Huston <shuston@riverace.com> * ace/Select_Reactor_T.cpp: diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h index 36b3da027fd..612e9ff0181 100644 --- a/ACE/ace/config-qnx.h +++ b/ACE/ace/config-qnx.h @@ -174,6 +174,7 @@ #define ACE_LACKS_WCSICMP #define ACE_LACKS_WCSNICMP #define ACE_LACKS_WCSDUP +#define ACE_LACKS_STD_WSTRING #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0) # define ACE_HAS_THREADS diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index 2494b8c848a..3894f67ad7e 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -111,6 +111,10 @@ # endif /* _REENTRANT */ # endif /* !ACE_MT_SAFE */ +# if (__GNUC__ < 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ <= 3)) +# define ACE_LACKS_STD_WSTRING 1 +# endif + #else /* ! __SUNPRO_CC && ! __GNUG__ */ # ifdef __cplusplus /* Let it slide for C compilers. */ # error unsupported compiler in ace/config-sunos5.5.h |