diff options
| author | Brad King <brad.king@kitware.com> | 2002-09-10 19:37:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2002-09-10 19:37:28 (GMT) |
| commit | eb1ff5f968e567ea441d86eb856c3fd3fb731e4a (patch) | |
| tree | 847ef654db030ff391b54bf13ea907f93f1c5dcb /Source/cmMakefile.cxx | |
| parent | 929a2b18f6163f28727c42115fd8004b48b79241 (diff) | |
| download | CMake-eb1ff5f968e567ea441d86eb856c3fd3fb731e4a.zip CMake-eb1ff5f968e567ea441d86eb856c3fd3fb731e4a.tar.gz CMake-eb1ff5f968e567ea441d86eb856c3fd3fb731e4a.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.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 14ad15c..a3f532d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1255,7 +1255,7 @@ void cmMakefile::RegisterData(cmData* data) { std::string name = data->GetName(); DataMap::const_iterator d = m_DataMap.find(name); - if((d != m_DataMap.end()) && (d->second != NULL) && (d->second != data)) + if((d != m_DataMap.end()) && (d->second != 0) && (d->second != data)) { delete d->second; } @@ -1270,7 +1270,7 @@ void cmMakefile::RegisterData(cmData* data) void cmMakefile::RegisterData(const char* name, cmData* data) { DataMap::const_iterator d = m_DataMap.find(name); - if((d != m_DataMap.end()) && (d->second != NULL) && (d->second != data)) + if((d != m_DataMap.end()) && (d->second != 0) && (d->second != data)) { delete d->second; } @@ -1291,7 +1291,7 @@ cmData* cmMakefile::LookupData(const char* name) const } else { - return NULL; + return 0; } } |