diff options
| author | jp4 <jp4@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-06 22:18:16 +0000 |
|---|---|---|
| committer | jp4 <jp4@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-06 22:18:16 +0000 |
| commit | 0ed9f74ef1ba644b498492397e44ade170e8970b (patch) | |
| tree | 9355e47157417476b5bcccc3558ed760a58205cd | |
| parent | b5dc749cd153df9d6dc202d6fdc4d2c50c5e507e (diff) | |
| download | ATCD-0ed9f74ef1ba644b498492397e44ade170e8970b.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 6 | ||||
| -rw-r--r-- | TAO/tao/DynUnion_i.cpp | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 1e35ac756eb..0f295541b35 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,9 @@ +Tue Oct 6 17:16:46 1998 Jeff Parsons <jp4@cs.wustl.edu> + + * tao/DynUnion_i.cpp: + Another try at making VxWorks happy without using memcmp in + DynUnion_i_T.cpp. This should do it. + Tue Oct 6 13:01:24 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * TAO_IDL/be/be_sunsoft.cpp: Fixed some problems with char and diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index 206bc6011e9..30ff2106803 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -1409,7 +1409,12 @@ template class DU_Extractor<CORBA::UShort>; template class DU_Extractor<CORBA::ULong>; template class DU_Extractor<CORBA::Boolean>; template class DU_Extractor<CORBA::Char>; + +// For Chorus and VxWorks +#if !defined (ACE_LACKS_LONGLONG_T) template class DU_Extractor<CORBA::LongLong>; +#endif /* ACE_LACKS_LONGLONG_T */ + template class DU_Extractor<CORBA::ULongLong>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate DU_Extractor<CORBA::Short> @@ -1418,7 +1423,12 @@ template class DU_Extractor<CORBA::ULongLong>; #pragma instantiate DU_Extractor<CORBA::ULong> #pragma instantiate DU_Extractor<CORBA::Boolean> #pragma instantiate DU_Extractor<CORBA::Char> + +// For Chorus and VxWorks +#if !defined (ACE_LACKS_LONGLONG_T) #pragma instantiate DU_Extractor<CORBA::LongLong> +#endif /* ACE_LACKS_LONGLONG_T */ + #pragma instantiate DU_Extractor<CORBA::ULongLong> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |