diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2008-10-23 15:39:42 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2008-10-23 15:39:42 +0000 |
| commit | c8c3c4149b0fcf35b68b9c4c96bebd33cdd37ea6 (patch) | |
| tree | 7584df35a2b47b195faeb5441542db963e18438e | |
| parent | 9c07cbb95a2ae9e63f979ee8576e4db65ee80ffb (diff) | |
| download | ATCD-c8c3c4149b0fcf35b68b9c4c96bebd33cdd37ea6.tar.gz | |
ChangeLogTag: Thu Oct 23 15:39:07 UTC 2008 Simon McQueen <sm@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/Bounded_Sequence_CDR_T.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Unbounded_Sequence_CDR_T.h | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 562249bd8c8..bb728a7c78c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,7 +1,14 @@ +Thu Oct 23 15:39:07 UTC 2008 Simon McQueen <sm@prismtech.com> + + * tao/Bounded_Sequence_CDR_T.h: + * tao/Unbounded_Sequence_CDR_T.h: + + Hopefully fix a Borland compilation error. + Thu Oct 23 14:15:00 UTC 2008 Simon Massey <sma at prismtech dot com> * orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp: - + Match the rename of ace/Process.h/cpp: Wed Oct 22 13:30:54 UTC 2008 Douglas C. Schmidt diff --git a/TAO/tao/Bounded_Sequence_CDR_T.h b/TAO/tao/Bounded_Sequence_CDR_T.h index 57565704c77..43c730ced8d 100644 --- a/TAO/tao/Bounded_Sequence_CDR_T.h +++ b/TAO/tao/Bounded_Sequence_CDR_T.h @@ -313,7 +313,7 @@ namespace TAO { sequence tmp; tmp.length(new_length); for(CORBA::ULong i = 0; i < new_length; ++i) { - if (!(strm >> tmp[i].out ())) { + if (!(strm >> static_cast<charT *&> (tmp[i].out ()))) { return false; } } diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h index 39ab18806be..6b01dc06d7d 100644 --- a/TAO/tao/Unbounded_Sequence_CDR_T.h +++ b/TAO/tao/Unbounded_Sequence_CDR_T.h @@ -349,7 +349,7 @@ namespace TAO { sequence tmp(new_length); tmp.length(new_length); for(CORBA::ULong i = 0; i < new_length; ++i) { - if (!(strm >> tmp[i].out ())) { + if (!(strm >> static_cast<charT *&> (tmp[i].out ()))) { return false; } } |