diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-08-28 07:21:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-08-28 07:21:32 +0000 |
| commit | b5ffe52055370f8a6e3b1accf8711a047317a7ce (patch) | |
| tree | 5d17760e0e056ac0840474e1ef2ed40b93545f58 /TAO/tao/Unbounded_Sequence_CDR_T.h | |
| parent | 3361a73b60d5f42a1bed421fc67f966d209c3bb3 (diff) | |
| download | ATCD-b5ffe52055370f8a6e3b1accf8711a047317a7ce.tar.gz | |
Mon Aug 28 07:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/Unbounded_Sequence_CDR_T.h')
| -rw-r--r-- | TAO/tao/Unbounded_Sequence_CDR_T.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h index 05384621441..519a1a1b989 100644 --- a/TAO/tao/Unbounded_Sequence_CDR_T.h +++ b/TAO/tao/Unbounded_Sequence_CDR_T.h @@ -172,7 +172,7 @@ namespace TAO { return true; } -# if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) +# if (defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)) && !defined (ACE_LACKS_NATIVE_WCHAR_T) template <typename stream> bool demarshal_sequence(stream & strm, TAO::unbounded_value_sequence <CORBA::WChar> & target) { typedef TAO::unbounded_value_sequence <CORBA::WChar> sequence; @@ -448,7 +448,7 @@ namespace TAO { return strm.write_char_array (source.get_buffer (), length); } -# if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR) +# if (defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)) && !defined (ACE_LACKS_NATIVE_WCHAR_T) template <typename stream> bool marshal_sequence(stream & strm, const TAO::unbounded_value_sequence <CORBA::WChar> & source) { if (0 == &source) |