Răsfoiți Sursa

ERR: Fixes for comeau compiler. NULL is a pointer of type void*, and cannot be compared directly with other pointer types. We use 0 instead.

Brad King 23 ani în urmă
părinte
comite
ce65c54d7a
2 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 1 1
      Source/cmCPluginAPI.cxx
  2. 1 1
      Source/cmLoadCommandCommand.cxx

+ 1 - 1
Source/cmCPluginAPI.cxx

@@ -312,7 +312,7 @@ void cmExpandSourceListArguments(void *arg,
     }
   mf->ExpandSourceListArguments(args2, result, startArgumentIndex);
   int resargc = static_cast<int>(result.size());
-  char **resargv = NULL;
+  char **resargv = 0;
   if (resargc)
     {
     resargv = (char **)malloc(resargc*sizeof(char *));

+ 1 - 1
Source/cmLoadCommandCommand.cxx

@@ -114,7 +114,7 @@ bool cmLoadedCommand::InitialPass(std::vector<std::string> const& args)
   
   // create argc and argv and then invoke the command
   int argc = static_cast<int> (args.size());
-  char **argv = NULL;
+  char **argv = 0;
   if (argc)
     {
     argv = (char **)malloc(argc*sizeof(char *));