Module Name: src
Committed By: christos
Date: Wed Oct 9 01:18:55 UTC 2019
Modified Files:
src/external/bsd/atf/dist/atf-c++: build.cpp
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
src/external/bsd/atf/dist/tools: process.cpp
Log Message:
the cast police is looking for me.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/atf/dist/atf-c++/build.cpp
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/dist/tools/process.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-c++/build.cpp
diff -u src/external/bsd/atf/dist/atf-c++/build.cpp:1.1.1.2 src/external/bsd/atf/dist/atf-c++/build.cpp:1.2
--- src/external/bsd/atf/dist/atf-c++/build.cpp:1.1.1.2 Wed Oct 20 05:14:20 2010
+++ src/external/bsd/atf/dist/atf-c++/build.cpp Tue Oct 8 21:18:55 2019
@@ -63,7 +63,7 @@ atf::process::argv_array
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 (...) {
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.11 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.12
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.11 Fri Oct 4 05:19:18 2019
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Tue Oct 8 21:18:55 2019
@@ -498,7 +498,7 @@ decode(const std::string& s)
{
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;
}
Index: src/external/bsd/atf/dist/tools/process.cpp
diff -u src/external/bsd/atf/dist/tools/process.cpp:1.5 src/external/bsd/atf/dist/tools/process.cpp:1.6
--- src/external/bsd/atf/dist/tools/process.cpp:1.5 Sat Feb 3 20:41:05 2018
+++ src/external/bsd/atf/dist/tools/process.cpp Tue Oct 8 21:18:55 2019
@@ -102,8 +102,7 @@ static
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
}
