[lmi-commits] [lmi] master a26fe6a 4/6: Eradicate old-style casts

[Greg Chicares]

branch: master
commit a26fe6aa3a7e75637b93f412485b719efc377885
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Eradicate old-style casts
---
 bourn_cast_test.cpp  |  8 ++++----
 contains.hpp         |  2 +-
 getopt.cpp           |  2 +-
 numeric_io_test.cpp  | 20 ++++++++++----------
 stream_cast_test.cpp |  4 ++--
 value_cast_test.cpp  | 14 +++++++-------
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/bourn_cast_test.cpp b/bourn_cast_test.cpp
index 508a1d5..3392fea 100644
--- a/bourn_cast_test.cpp
+++ b/bourn_cast_test.cpp
@@ -756,17 +756,17 @@ int test_main(int, char*[])
     // are guaranteed to cover such diversity, even on a machine where
     // unsigned char and unsigned long long int are synonyms.
 
-    BOOST_TEST_EQUAL(true , bourn_cast<bool>((signed char)(1)));
-    BOOST_TEST_EQUAL(false, bourn_cast<bool>((signed char)(0)));
+    BOOST_TEST_EQUAL(true , bourn_cast<bool>(static_cast<signed char>(1)));
+    BOOST_TEST_EQUAL(false, bourn_cast<bool>(static_cast<signed char>(0)));
 
     BOOST_TEST_THROW
-        (bourn_cast<bool>((signed char)(2))
+        (bourn_cast<bool>(static_cast<signed char>(2))
         ,std::runtime_error
         ,"Cast would transgress upper limit."
         );
 
     BOOST_TEST_THROW
-        (bourn_cast<bool>((signed char)(-1))
+        (bourn_cast<bool>(static_cast<signed char>(-1))
         ,std::runtime_error
         ,"Cannot cast negative to unsigned."
         );
diff --git a/contains.hpp b/contains.hpp
index 87a2ef1..9fc95f2 100644
--- a/contains.hpp
+++ b/contains.hpp
@@ -53,7 +53,7 @@ struct has_member_find
 
     static yea_t deduce(...);
 
-    static bool const value = sizeof(yea_t) == sizeof 
deduce((Derived*)nullptr);
+    static bool const value = sizeof(yea_t) == sizeof 
deduce(static_cast<Derived*>(nullptr));
 };
 
 /// Ascertain whether a "container" includes a given element.
diff --git a/getopt.cpp b/getopt.cpp
index fb72ddf..b4528c6 100644
--- a/getopt.cpp
+++ b/getopt.cpp
@@ -197,7 +197,7 @@ GetOpt::Initialize(std::string const& a_optstring)
 void
 GetOpt::exchange(char** argv)
 {
-  int nonopts_size = (last_nonopt - first_nonopt) * (int)sizeof(char*);
+  int nonopts_size = (last_nonopt - first_nonopt) * 
static_cast<int>(sizeof(char*));
 // GWC substituted std::malloc() for alloca() and added call to std::free() 
below.
 //  char** temp = static_cast<char**>(alloca(nonopts_size));
   char** temp = static_cast<char**>(std::malloc(nonopts_size));
diff --git a/numeric_io_test.cpp b/numeric_io_test.cpp
index c0e8f6b..5845607 100644
--- a/numeric_io_test.cpp
+++ b/numeric_io_test.cpp
@@ -232,19 +232,19 @@ int test_main(int, char*[])
 #   pragma GCC diagnostic ignored "-Wuseless-cast"
 #endif // defined __GNUC__
 
-    test_interconvertibility((         char)(   1), "1", __FILE__, __LINE__);
-    test_interconvertibility((         char)('\1'), "1", __FILE__, __LINE__);
+    test_interconvertibility(static_cast<         char>(   1), "1", __FILE__, 
__LINE__);
+    test_interconvertibility(static_cast<         char>('\1'), "1", __FILE__, 
__LINE__);
 
-    test_interconvertibility((  signed char)(   1), "1", __FILE__, __LINE__);
-    test_interconvertibility((  signed char)('\1'), "1", __FILE__, __LINE__);
+    test_interconvertibility(static_cast<  signed char>(   1), "1", __FILE__, 
__LINE__);
+    test_interconvertibility(static_cast<  signed char>('\1'), "1", __FILE__, 
__LINE__);
 
-    test_interconvertibility((unsigned char)(   1), "1", __FILE__, __LINE__);
-    test_interconvertibility((unsigned char)('\1'), "1", __FILE__, __LINE__);
+    test_interconvertibility(static_cast<unsigned char>(   1), "1", __FILE__, 
__LINE__);
+    test_interconvertibility(static_cast<unsigned char>('\1'), "1", __FILE__, 
__LINE__);
 
-    test_interconvertibility((  signed char)(-1),  "-1", __FILE__, __LINE__);
+    test_interconvertibility(static_cast<  signed char>(-1),  "-1", __FILE__, 
__LINE__);
     std::ostringstream u;
     u << static_cast<unsigned int>(std::numeric_limits<unsigned char>::max());
-    test_interconvertibility((unsigned char)(-1), u.str(), __FILE__, __LINE__);
+    test_interconvertibility(static_cast<unsigned char>(-1), u.str(), 
__FILE__, __LINE__);
 
     // This test should fail because numeric_io_cast interprets
     // arithmetic types as numeric values, so the value of ' ' might
@@ -336,12 +336,12 @@ int test_main(int, char*[])
 //    BOOST_TEST_THROW(numeric_io_cast<double*>("0"), std::invalid_argument, 
"");
 
     BOOST_TEST_THROW
-        (numeric_io_cast<std::string>((char const*)nullptr)
+        (numeric_io_cast<std::string>(static_cast<char const*>(nullptr))
         ,std::runtime_error
         ,"Cannot convert (char const*)(0) to std::string."
         );
     BOOST_TEST_THROW
-        (numeric_io_cast<unsigned int>((char const*)nullptr)
+        (numeric_io_cast<unsigned int>(static_cast<char const*>(nullptr))
         ,std::runtime_error
         ,"Cannot convert (char const*)(0) to number."
         );
diff --git a/stream_cast_test.cpp b/stream_cast_test.cpp
index 7239a22..ac003d6 100644
--- a/stream_cast_test.cpp
+++ b/stream_cast_test.cpp
@@ -173,13 +173,13 @@ int test_main(int, char*[])
     // explains, a conversion to bool is used instead.
 
     BOOST_TEST_THROW
-        (stream_cast<std::string>((char*)nullptr)
+        (stream_cast<std::string>(static_cast<char*>(nullptr))
         ,std::runtime_error
         ,"Cannot convert (char*)(0) to std::string."
         );
 
     BOOST_TEST_THROW
-        (stream_cast<std::string>((char const*)nullptr)
+        (stream_cast<std::string>(static_cast<char const*>(nullptr))
         ,std::runtime_error
         ,"Cannot convert (char const*)(0) to std::string."
         );
diff --git a/value_cast_test.cpp b/value_cast_test.cpp
index e267eac..319b4b1 100644
--- a/value_cast_test.cpp
+++ b/value_cast_test.cpp
@@ -119,9 +119,9 @@ int test_main(int, char*[])
     BOOST_TEST_EQUAL(e_direct       ,method(cp  ,ccp));
 
     // Not convertible: value_cast() forbids conversion to pointer.
-    BOOST_TEST_EQUAL(e_stream       ,method(s, (char volatile*)nullptr   ));
+    BOOST_TEST_EQUAL(e_stream       ,method(s, static_cast<char 
volatile*>(nullptr)   ));
 
-    BOOST_TEST_EQUAL(e_stream       ,method(   (char volatile*)nullptr, s));
+    BOOST_TEST_EQUAL(e_stream       ,method(   static_cast<char 
volatile*>(nullptr), s));
 
     ndc = value_cast<NotDefaultConstructible>(ndc);
     ndc = value_cast(ndc, ndc);
@@ -270,19 +270,19 @@ int extra_tests0()
     BOOST_TEST_THROW(value_cast<double>(""), std::invalid_argument, "");
 
     BOOST_TEST_THROW
-        (value_cast<std::string>((char*)nullptr)
+        (value_cast<std::string>(static_cast<char*>(nullptr))
         ,std::runtime_error
         ,"Null pointer holds no value to convert."
         );
 
     BOOST_TEST_THROW
-        (value_cast<std::string>((char const*)nullptr)
+        (value_cast<std::string>(static_cast<char const*>(nullptr))
         ,std::runtime_error
         ,"Null pointer holds no value to convert."
         );
 
-    BOOST_TEST_EQUAL("0", value_cast<std::string>((char volatile*)nullptr));
-    BOOST_TEST_EQUAL("0", value_cast<std::string>((char const 
volatile*)nullptr));
+    BOOST_TEST_EQUAL("0", value_cast<std::string>(static_cast<char 
volatile*>(nullptr)));
+    BOOST_TEST_EQUAL("0", value_cast<std::string>(static_cast<char const 
volatile*>(nullptr)));
 
     // Numeric casts from
     //   (char               *)(0)
@@ -290,7 +290,7 @@ int extra_tests0()
     //   (char const volatile*)(0)
     // are forbidden by a compile-time assertion.
     BOOST_TEST_THROW
-        (value_cast<unsigned int>((char const*)nullptr)
+        (value_cast<unsigned int>(static_cast<char const*>(nullptr))
         ,std::runtime_error
         ,"Cannot convert (char const*)(0) to number."
         );