diff options
| author | sjiang <sjiang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-15 15:30:22 +0000 |
|---|---|---|
| committer | sjiang <sjiang@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-03-15 15:30:22 +0000 |
| commit | 860751aa15b44c20b4d9d5e75a402a5cc93d6b2c (patch) | |
| tree | 83e78becf940453d304f1966431990ba1f987ba6 | |
| parent | b70142d4198acf1a7ce8de5f058f19392920390f (diff) | |
| download | ATCD-860751aa15b44c20b4d9d5e75a402a5cc93d6b2c.tar.gz | |
ChangeLog Tag: Wed Mar 15 15:27:51 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ace/Capabilities.cpp | 3 | ||||
| -rw-r--r-- | ace/Codecs.cpp | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 208ef2f75df..0852f34fcc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 15 15:27:51 UTC 2006 jiang,shanshan <shanshan.jiang@vanderbilt.edu> + + * ace/Capabilities.cpp + * ace/Codecs.cpp + Updated these files to solve the Capabilities_Test & Codecs_Test + tests errors. + Wed Mar 15 12:18:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * etc/*.doxygen: diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp index 13ce7a77f51..279c373d161 100644 --- a/ace/Capabilities.cpp +++ b/ace/Capabilities.cpp @@ -331,8 +331,7 @@ ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name) ACE_TString newline; ACE_TString description; - done = this->getline (fp, newline) == -1; - while (!done) + while (0 == (done = (this->getline (fp, newline) == -1))) if (is_line (newline.c_str ())) description += newline; else diff --git a/ace/Codecs.cpp b/ace/Codecs.cpp index ae054c26938..d28cda908d1 100644 --- a/ace/Codecs.cpp +++ b/ace/Codecs.cpp @@ -157,9 +157,9 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) if (char_count == 4) { - result[pos++] = static_cast<ACE_Byte> (bits) >> 16; - result[pos++] = (static_cast<ACE_Byte> (bits) >> 8) & 0xff; - result[pos++] = static_cast<ACE_Byte> (bits) & 0xff; + result[pos++] = static_cast<ACE_Byte> (bits >> 16); + result[pos++] = static_cast<ACE_Byte> ((bits >> 8) & 0xff); + result[pos++] = static_cast<ACE_Byte> (bits & 0xff); bits = 0; char_count = 0; } @@ -190,11 +190,11 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) errors++; break; case 2: - result[pos++] = static_cast<ACE_Byte> (bits) >> 10; + result[pos++] = static_cast<ACE_Byte> (bits >> 10); break; case 3: - result[pos++] = static_cast<ACE_Byte> (bits) >> 16; - result[pos++] = (static_cast<ACE_Byte> (bits) >> 8) & 0xff; + result[pos++] = static_cast<ACE_Byte> (bits >> 16); + result[pos++] = static_cast<ACE_Byte> ((bits >> 8) & 0xff); break; } } |