From 95a6feaa66e6cafcc310cdaddddb5eaf7c4bb866 Mon Sep 17 00:00:00 2001 From: David Cole Date: Tue, 9 Dec 2008 10:56:41 -0500 Subject: COMP: Don't emit old style cast warning when configured as C++ but still allow being configured as C. Thanks to Monsieur Francois Bertel for the patch. --- Templates/TestDriver.cxx.in | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in index 8c9f54e..9e53030 100644 --- a/Templates/TestDriver.cxx.in +++ b/Templates/TestDriver.cxx.in @@ -29,7 +29,14 @@ functionMapEntry cmakeGeneratedFunctionMapEntries[] = { char* lowercase(const char *string) { char *new_string, *p; - new_string = (char *)malloc(sizeof(char) * (size_t)(strlen(string) + 1)); + +#ifdef __cplusplus + new_string = static_cast(malloc(sizeof(char) * + static_cast(strlen(string) + 1))); +#else + new_string = (char *)(malloc(sizeof(char) * (size_t)(strlen(string) + 1))); +#endif + if (!new_string) { return 0; @@ -38,7 +45,12 @@ char* lowercase(const char *string) p = new_string; while (*p != 0) { - *p = (char)tolower(*p); +#ifdef __cplusplus + *p = static_cast(tolower(*p)); +#else + *p = (char)(tolower(*p)); +#endif + ++p; } return new_string; -- cgit v0.12