diff options
| author | zhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-07-23 19:38:05 +0000 |
|---|---|---|
| committer | zhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-07-23 19:38:05 +0000 |
| commit | dde4db6d87a3ef61baa83be8ffe170e1b7169cca (patch) | |
| tree | 3c79fb770d98f90e00ecb52c01a481f3c02d5472 | |
| parent | 56252c206ce9f6fd7d3100a48026c70b7cc415e4 (diff) | |
| download | ATCD-dde4db6d87a3ef61baa83be8ffe170e1b7169cca.tar.gz | |
Mon Jul 23 19:38:23 UTC 2007 Wallace Zhang <zhang_w@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/Object_KeyC.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/diffs/Object_Key.diff | 16 |
3 files changed, 26 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9469fcf5f2c..b0619c0a6dd 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,7 +1,14 @@ +Mon Jul 23 19:38:23 UTC 2007 Wallace Zhang <zhang_w@ociweb.com> + + * tao/Object_KeyC.cpp: + * tao/diffs/Object_Key.diff: + + Fixed a warning in the WinCE VC8 debug build. + Mon Jul 23 13:19:19 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu> * NEWS: - + Added item about support for forward declared IDL structs and unions in the IFR loader. diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp index af8f7841018..e09c9967a39 100644 --- a/TAO/tao/Object_KeyC.cpp +++ b/TAO/tao/Object_KeyC.cpp @@ -130,8 +130,8 @@ TAO::ObjectKey::encode_sequence_to_string (char* & str, } *cp++ = '%'; - *cp++ = ACE::nibble2hex ((bt >> 4) & 0x0f); - *cp++ = ACE::nibble2hex (bt & 0x0f); + *cp++ = static_cast<char> (ACE::nibble2hex ((bt >> 4) & 0x0f)); + *cp++ = static_cast<char> (ACE::nibble2hex (bt & 0x0f)); } // Zero terminate *cp = '\0'; diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff index 6788be4dfa6..d9625d6efa2 100644 --- a/TAO/tao/diffs/Object_Key.diff +++ b/TAO/tao/diffs/Object_Key.diff @@ -198,3 +198,19 @@ }; #endif /* end #if !defined */ + +Index: Object_KeyC.cpp +=================================================================== +--- Object_KeyC.cpp (revision 79001) ++++ Object_KeyC.cpp (working copy) +@@ -130,8 +130,8 @@ + } + + *cp++ = '%'; +- *cp++ = ACE::nibble2hex ((bt >> 4) & 0x0f); +- *cp++ = ACE::nibble2hex (bt & 0x0f); ++ *cp++ = static_cast<char> (ACE::nibble2hex ((bt >> 4) & 0x0f)); ++ *cp++ = static_cast<char> (ACE::nibble2hex (bt & 0x0f)); + } + // Zero terminate + *cp = '\0'; |