diff src/oct-stream.cc @ 5760:8d7162924bd3

[project @ 2006-04-14 04:01:37 by jwe]
author jwe
date Fri, 14 Apr 2006 04:01:40 +0000 (2006-04-14)
parents 960f4b9a26af
children 7ba9ad1fec11
line wrap: on
line diff
--- a/src/oct-stream.cc
+++ b/src/oct-stream.cc
@@ -288,7 +288,7 @@
       unsigned char c = s[i++];
 
       if (c == '-' && i > 1 && i < len
-	  && (unsigned char) s[i-2] <= (unsigned char) s[i])
+	  && static_cast<unsigned char> (s[i-2]) <= static_cast<unsigned char> (s[i]))
 	{
 	  // Add all characters from the range except the first (we
 	  // already added it below).
@@ -990,14 +990,14 @@
 	  if (c == '\n')
 	    {
 	      if (! strip_newline)
-		buf << (char) c;
+		buf << static_cast<char> (c);
 	      else
 		newline_stripped = 1;
 
 	      break;
 	    }
 	  else
-	    buf << (char) c;
+	    buf << static_cast<char> (c);
 
 	  if (max_len > 0 && char_count == max_len)
 	    break;
@@ -1454,7 +1454,7 @@
   int n = 0; \
  \
   while (is && n < width && (c = is.get ()) != EOF) \
-    tbuf[n++] = (char) c; \
+    tbuf[n++] = static_cast<char> (c);		    \
  \
   tbuf[n] = '\0'; \
  \
@@ -1548,13 +1548,13 @@
 	    { \
 	      while (is && (c = is.get ()) != EOF \
 		     && char_class.find (c) != NPOS) \
-		buf << (char) c; \
+		buf << static_cast<char> (c);	     \
 	    } \
 	  else \
 	    { \
 	      while (is && (c = is.get ()) != EOF \
 		     && char_class.find (c) == NPOS) \
-		buf << (char) c; \
+		buf << static_cast<char> (c);		     \
 	    } \
  \
 	  if (c != EOF) \