summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2002-09-10 19:39:18 (GMT)
committerBrad King <brad.king@kitware.com>2002-09-10 19:39:18 (GMT)
commitce65c54d7a61947ee7b566dc8e7cca9fbc30da2c (patch)
tree2b9081cda1b0a4bf53022a81d3fe1241abfe955c
parent807b4ac47f9db38bfd77a2a9d5e6be9959f9bf82 (diff)
downloadCMake-ce65c54d7a61947ee7b566dc8e7cca9fbc30da2c.zip
CMake-ce65c54d7a61947ee7b566dc8e7cca9fbc30da2c.tar.gz
CMake-ce65c54d7a61947ee7b566dc8e7cca9fbc30da2c.tar.bz2
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.
-rw-r--r--Source/cmCPluginAPI.cxx2
-rw-r--r--Source/cmLoadCommandCommand.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index b141160..6fb744e 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/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 *));
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index 16e16ee..3c098f5 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/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 *));