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.
This commit is contained in:
parent
807b4ac47f
commit
ce65c54d7a
@ -312,7 +312,7 @@ void cmExpandSourceListArguments(void *arg,
|
|||||||
}
|
}
|
||||||
mf->ExpandSourceListArguments(args2, result, startArgumentIndex);
|
mf->ExpandSourceListArguments(args2, result, startArgumentIndex);
|
||||||
int resargc = static_cast<int>(result.size());
|
int resargc = static_cast<int>(result.size());
|
||||||
char **resargv = NULL;
|
char **resargv = 0;
|
||||||
if (resargc)
|
if (resargc)
|
||||||
{
|
{
|
||||||
resargv = (char **)malloc(resargc*sizeof(char *));
|
resargv = (char **)malloc(resargc*sizeof(char *));
|
||||||
|
@ -114,7 +114,7 @@ bool cmLoadedCommand::InitialPass(std::vector<std::string> const& args)
|
|||||||
|
|
||||||
// create argc and argv and then invoke the command
|
// create argc and argv and then invoke the command
|
||||||
int argc = static_cast<int> (args.size());
|
int argc = static_cast<int> (args.size());
|
||||||
char **argv = NULL;
|
char **argv = 0;
|
||||||
if (argc)
|
if (argc)
|
||||||
{
|
{
|
||||||
argv = (char **)malloc(argc*sizeof(char *));
|
argv = (char **)malloc(argc*sizeof(char *));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user