[Cmake-commits] [cmake-commits] hoffman committed TestDriver.cxx.in 1.6.16.1 1.6.16.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Templates
In directory public:/mounts/ram/cvs-serv19604/Templates

Modified Files:
      Tag: CMake-2-6
	TestDriver.cxx.in 
Log Message:
ENH: merge fixes for RC 6


Index: TestDriver.cxx.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Templates/TestDriver.cxx.in,v
retrieving revision 1.6.16.1
retrieving revision 1.6.16.2
diff -C 2 -d -r1.6.16.1 -r1.6.16.2
*** TestDriver.cxx.in	2 Dec 2008 12:07:41 -0000	1.6.16.1
--- TestDriver.cxx.in	31 Dec 2008 15:14:33 -0000	1.6.16.2
***************
*** 30,34 ****
  {
    char *new_string, *p;
!   new_string = (char *)malloc(sizeof(char) * (size_t)(strlen(string) + 1));
    if (!new_string)
      {
--- 30,41 ----
  {
    char *new_string, *p;
! 
! #ifdef __cplusplus
!   new_string = static_cast<char *>(malloc(sizeof(char) *
!     static_cast<size_t>(strlen(string) + 1)));
! #else
!   new_string = (char *)(malloc(sizeof(char) * (size_t)(strlen(string) + 1)));
! #endif
! 
    if (!new_string)
      {
***************
*** 39,43 ****
    while (*p != 0)
      {
!     *p = (char)tolower(*p);
      ++p;
      }
--- 46,55 ----
    while (*p != 0)
      {
! #ifdef __cplusplus
!     *p = static_cast<char>(tolower(*p));
! #else
!     *p = (char)(tolower(*p));
! #endif
! 
      ++p;
      }