diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-11 19:23:06 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-11 19:23:06 +0000 |
| commit | dcd8a39aaed15c6d944c9d4a51b758402af38a6f (patch) | |
| tree | 511b3d6e8656258aebcff5aa3ba3dfc4bfb11894 | |
| parent | a978528ef84cb9072744d890d2a33c30a49833d2 (diff) | |
| download | ATCD-dcd8a39aaed15c6d944c9d4a51b758402af38a6f.tar.gz | |
ChangeLogTag: Thu Jun 11 19:19:42 UTC 2009 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/utils/logWalker/Invocation.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b12623bd829..6dcc095d3e8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 11 19:19:42 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * utils/logWalker/Invocation.cpp: + + Cast to int to force ternary operator's type to int, avoiding a + warning on GCC 4.0.2 on Solaris. + Thu Jun 11 18:19:57 UTC 2009 Adam Mitz <mitza@ociweb.com> * utils/logWalker/Invocation.cpp: diff --git a/TAO/utils/logWalker/Invocation.cpp b/TAO/utils/logWalker/Invocation.cpp index 1059840d0c4..7f2d57bc6b7 100644 --- a/TAO/utils/logWalker/Invocation.cpp +++ b/TAO/utils/logWalker/Invocation.cpp @@ -134,7 +134,7 @@ Invocation::GIOP_Buffer::add_octets(const char *text) c = err+1; } size_t cs = this->cur_size(); - return cs == this->size_ ? -1 : cs / 16; + return cs == this->size_ ? -1 : int(cs) / 16; } bool |