[APPROVAL] review/bdlsb-test-build-failures-toupper-jira-676 to master

bloomberg · Oct 14, 2015 · 1a8f20f · 1a8f20f
2 parents e1f7483 + 083f05e
commit 1a8f20f
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 19 deletions.
diff --git a/groups/bdl/bdlsb/bdlsb_memoutstreambuf.h b/groups/bdl/bdlsb/bdlsb_memoutstreambuf.h
@@ -86,9 +86,24 @@ BSLS_IDENT("$Id: $")
 //  {
 //  }
 //..
-// As is typical, the streaming operators are made friends of the class.  We
-// use the 'transform' algorithm to convert lower-case characters to
-// upper-case.
+// As is typical, the streaming operators are made friends of the class.
+//
+// Note that we cannot directly use 'bsl::toupper' to capitalize each
+// individual character, because 'bsl::toupper' operates on 'int' instead of
+// 'char'.  Instead, we call a function 'ucharToUpper' that works in terms of
+// 'unsigned char'.  some care must be made to avoid undefined and
+// implementation-specific behavior during the conversions to and from 'int'.
+// Therefore we wrap 'bsl::toupper' in an interface that works in terms of
+// 'unsigned char':
+//..
+//  static unsigned char ucharToUpper(unsigned char input)
+//      // Return the upper-case equivalent to the specified 'input' character.
+//  {
+//      return bsl::toupper(input);
+//  }
+//..
+// Finally, we use the 'transform' algorithm to convert lower-case characters
+// to upper-case.
 //..
 //  // FREE OPERATORS
 //  CapitalizingStream& operator<<(CapitalizingStream&  stream,
@@ -98,7 +113,7 @@ BSLS_IDENT("$Id: $")
 //      bsl::transform(tmp.begin(),
 //                     tmp.end(),
 //                     tmp.begin(),
-//                     bsl::toupper);
+//                     ucharToUpper);
 //      stream.d_streamBuffer_p->sputn(tmp.data(), tmp.length());
 //      return stream;
 //  }
@@ -118,7 +133,9 @@ BSLS_IDENT("$Id: $")
 // into dynamically allocated buffer:
 //..
 //  assert(12 == streamBuffer.length());
-//  assert(0  == bsl::strcmp("HELLO WORLD.", streamBuffer.data()));
+//  assert(0  == bsl::strncmp("HELLO WORLD.",
+//                            streamBuffer.data(),
+//                            streamBuffer.length()));
 //..
 
 #ifndef INCLUDED_BDLSCM_VERSION

diff --git a/groups/bdl/bdlsb/bdlsb_memoutstreambuf.t.cpp b/groups/bdl/bdlsb/bdlsb_memoutstreambuf.t.cpp
@@ -526,9 +526,24 @@ namespace {
     {
     }
 //..
-// As is typical, the streaming operators are made friends of the class.  We
-// use the 'transform' algorithm to convert lower-case characters to
-// upper-case.
+// As is typical, the streaming operators are made friends of the class.
+//
+// Note that we cannot directly use 'bsl::toupper' to capitalize each
+// individual character, because 'bsl::toupper' operates on 'int' instead of
+// 'char'.  Instead, we call a function 'ucharToUpper' that works in terms of
+// 'unsigned char'.  some care must be made to avoid undefined and
+// implementation-specific behavior during the conversions to and from 'int'.
+// Therefore we wrap 'bsl::toupper' in an interface that works in terms of
+// 'unsigned char':
+//..
+    static unsigned char ucharToUpper(unsigned char input)
+        // Return the upper-case equivalent to the specified 'input' character.
+    {
+        return bsl::toupper(input);
+    }
+//..
+// Finally, we use the 'transform' algorithm to convert lower-case characters
+// to upper-case.
 //..
     // FREE OPERATORS
     CapitalizingStream& operator<<(CapitalizingStream&  stream,
@@ -538,8 +553,7 @@ namespace {
         bsl::transform(tmp.begin(),
                        tmp.end(),
                        tmp.begin(),
-                       bsl::toupper);
-                       //static_cast<int(*)(int)>(bsl::toupper));
+                       ucharToUpper);
         stream.d_streamBuffer_p->sputn(tmp.data(), tmp.length());
         return stream;
     }
@@ -600,7 +614,9 @@ int main(int argc, char *argv[])
 // into dynamically allocated buffer:
 //..
     ASSERT(12 == streamBuffer.length());
-    ASSERT(0  == bsl::strcmp("HELLO WORLD.", streamBuffer.data()));
+    ASSERT(0  == bsl::strncmp("HELLO WORLD.",
+                              streamBuffer.data(),
+                              streamBuffer.length()));
 //..
         }
       } break;

diff --git a/groups/bdl/bdlsb/bdlsb_overflowmemoutstreambuf.h b/groups/bdl/bdlsb/bdlsb_overflowmemoutstreambuf.h
@@ -101,9 +101,24 @@ BSLS_IDENT("$Id: $")
 //  {
 //  }
 //..
-// As is typical, the streaming operators are made friends of the class.  We
-// use the 'transform' algorithm to convert lower-case characters to
-// upper-case.
+// As is typical, the streaming operators are made friends of the class.
+//
+// Note that we cannot directly use 'bsl::toupper' to capitalize each
+// individual character, because 'bsl::toupper' operates on 'int' instead of
+// 'char'.  Instead, we call a function 'ucharToUpper' that works in terms of
+// 'unsigned char'.  some care must be made to avoid undefined and
+// implementation-specific behavior during the conversions to and from 'int'.
+// Therefore we wrap 'bsl::toupper' in an interface that works in terms of
+// 'unsigned char':
+//..
+//  static unsigned char ucharToUpper(unsigned char input)
+//      // Return the upper-case equivalent to the specified 'input' character.
+//  {
+//      return bsl::toupper(input);
+//  }
+//..
+// Finally, we use the 'transform' algorithm to convert lower-case characters
+// to upper-case.
 //..
 //  // FREE OPERATORS
 //  CapitalizingStream& operator<<(CapitalizingStream&  stream,
@@ -113,7 +128,7 @@ BSLS_IDENT("$Id: $")
 //      bsl::transform(tmp.begin(),
 //                     tmp.end(),
 //                     tmp.begin(),
-//                     bsl::toupper);
+//                     ucharToUpper);
 //      stream.d_streamBuffer_p->sputn(tmp.data(), tmp.length());
 //      return stream;
 //  }

diff --git a/groups/bdl/bdlsb/bdlsb_overflowmemoutstreambuf.t.cpp b/groups/bdl/bdlsb/bdlsb_overflowmemoutstreambuf.t.cpp
@@ -280,9 +280,24 @@ namespace {
     {
     }
 //..
-// As is typical, the streaming operators are made friends of the class.  We
-// use the 'transform' algorithm to convert lower-case characters to
-// upper-case.
+// As is typical, the streaming operators are made friends of the class.
+//
+// Note that we cannot directly use 'bsl::toupper' to capitalize each
+// individual character, because 'bsl::toupper' operates on 'int' instead of
+// 'char'.  Instead, we call a function 'ucharToUpper' that works in terms of
+// 'unsigned char'.  some care must be made to avoid undefined and
+// implementation-specific behavior during the conversions to and from 'int'.
+// Therefore we wrap 'bsl::toupper' in an interface that works in terms of
+// 'unsigned char':
+//..
+    static unsigned char ucharToUpper(unsigned char input)
+        // Return the upper-case equivalent to the specified 'input' character.
+    {
+        return bsl::toupper(input);
+    }
+//..
+// Finally, we use the 'transform' algorithm to convert lower-case characters
+// to upper-case.
 //..
     // FREE OPERATORS
     CapitalizingStream& operator<<(CapitalizingStream&  stream,
@@ -292,7 +307,7 @@ namespace {
         bsl::transform(tmp.begin(),
                        tmp.end(),
                        tmp.begin(),
-                       bsl::toupper);
+                       ucharToUpper);
         stream.d_streamBuffer_p->sputn(tmp.data(), tmp.length());
         return stream;
     }