Wed Oct 9 01:18:55 2019 UTC ()

the cast police is looking for me.


(christos)

diff -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-c++/build.cpp
diff -r1.11 -r1.12 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -r1.5 -r1.6 src/external/bsd/atf/dist/tools/process.cpp

--- src/external/bsd/atf/dist/atf-c++/build.cpp 2010/10/20 09:14:20	1.1.1.2

+++ src/external/bsd/atf/dist/atf-c++/build.cpp 2019/10/09 01:18:55	1.2

@@ -63,7 +63,7 @@
 cargv_to_argv_and_free(char** l)
 {
     try {
-        atf::process::argv_array argv((const char* const*)l);
+        atf::process::argv_array argv(const_cast<const char* const*>(l));
         atf_utils_free_charpp(l);
         return argv;
     } catch (...) {

--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp 2019/10/04 09:19:18	1.11

+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp 2019/10/09 01:18:55	1.12

@@ -498,7 +498,7 @@
                 {
                     int count = 3;
                     c = 0;
-                    while (--count >= 0 && (unsigned)(s[i] - '0') < 8)
+                    while (--count >= 0 && static_cast<unsigned>(s[i] - '0') < 8)
                         c = (c << 3) + (s[i++] - '0');
                     break;
                 }

--- src/external/bsd/atf/dist/tools/process.cpp 2018/02/04 01:41:05	1.5

+++ src/external/bsd/atf/dist/tools/process.cpp 2019/10/09 01:18:55	1.6

@@ -102,8 +102,7 @@
 int
 const_execvp(const char *file, const char *const *argv)
 {
-#define UNCONST(a) ((void *)(unsigned long)(const void *)(a))
-    return ::execvp(file, (char* const*)(UNCONST(argv)));
+    return ::execvp(file, const_cast<char* const*>(argv));
 #undef UNCONST
 }