diff options
| author | mcorino <mcorino@users.noreply.github.com> | 2004-11-10 16:40:43 +0000 |
|---|---|---|
| committer | mcorino <mcorino@users.noreply.github.com> | 2004-11-10 16:40:43 +0000 |
| commit | b231b1876624ab6ca70dad4bab692ae85f143310 (patch) | |
| tree | ccc03e49b1d7571c915d81be528ce44be6f29df6 | |
| parent | 73af0436c311b6278bbb09d6eb97523c94d3ce9c (diff) | |
| download | ATCD-b231b1876624ab6ca70dad4bab692ae85f143310.tar.gz | |
ChangeLogTag: Wed Nov 10 16:38:12 UTC 2004 Martin Corino <mcorino@remedy.nl>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/config-vxworks5.x.h | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f403477656a..56e67c74534 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Nov 10 16:38:12 UTC 2004 Martin Corino <mcorino@remedy.nl> + + * ace/config-vxworks5.x.h: + Added template specialization macros for DIAB builds. + Wed Nov 10 16:35:12 UTC 2004 Martin Corino <mcorino@remedy.nl> * bin/MakeProjectCreator/templates/gnu.mpd: diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index d803520388e..0dd4ae7c7cf 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -25,7 +25,7 @@ // Compiler-specific configuration. #if defined (__GNUG__) # include "ace/config-g++-common.h" - +# undef ACE_HAS_TEMPLATE_SPECIALIZATION // We have to explicitly instantiate static template members # define ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION @@ -92,6 +92,9 @@ # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 0 +# define ACE_HAS_STD_TEMPLATE_SPECIALIZATION +# define ACE_HAS_STD_TEMPLATE_CLASS_MEMBER_SPECIALIZATION + #else /* ! __GNUG__ && ! ghs && !__DCC__ */ # error unsupported compiler on VxWorks #endif /* ! __GNUG__ && ! ghs */ @@ -249,6 +252,10 @@ # define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536 #endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */ +#if !defined (ACE_NTRACE) +# define ACE_NTRACE 1 +#endif /* ACE_NTRACE */ + // By default, don't include RCS Id strings in object code. #if !defined (ACE_USE_RCSID) #define ACE_USE_RCSID 0 |