kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmTarget-null_ptr-everywhere' 

32a191ce cmTarget: Use null_ptr code path on all platforms
This commit is contained in:
Brad King 2014-11-25 10:18:35 -05:00 committed by CMake Topic Stage
parent 0ff35425d7 32a191ce4b
commit ce64e3607f
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmTarget.cxx
View File

@ -4798,11 +4798,7 @@ std::pair<bool, const char*> consistentNumberProperty(const char *lhs,
{ {
char *pEnd; char *pEnd;
#if defined(_MSC_VER) const char* const null_ptr = 0;
static const char* const null_ptr = 0;
#else
# define null_ptr 0
#endif
long lnum = strtol(lhs, &pEnd, 0); long lnum = strtol(lhs, &pEnd, 0);
if (pEnd == lhs || *pEnd != '\0' || errno == ERANGE) if (pEnd == lhs || *pEnd != '\0' || errno == ERANGE)
@ -4816,10 +4812,6 @@ std::pair<bool, const char*> consistentNumberProperty(const char *lhs,
return std::pair<bool, const char*>(false, null_ptr); return std::pair<bool, const char*>(false, null_ptr);
} }
#if !defined(_MSC_VER)
#undef null_ptr
#endif
if (t == NumberMaxType) if (t == NumberMaxType)
{ {
return std::make_pair(true, cmMaximum(lnum, rnum) == lnum ? lhs : rhs); return std::make_pair(true, cmMaximum(lnum, rnum) == lnum ? lhs : rhs);
@ -4849,11 +4841,7 @@ std::pair<bool, const char*> consistentProperty(const char *lhs,
return std::make_pair(true, lhs); return std::make_pair(true, lhs);
} }
#if defined(_MSC_VER) const char* const null_ptr = 0;
static const char* const null_ptr = 0;
#else
# define null_ptr 0
#endif
switch(t) switch(t)
{ {
@ -4868,11 +4856,6 @@ std::pair<bool, const char*> consistentProperty(const char *lhs,
} }
assert(!"Unreachable!"); assert(!"Unreachable!");
return std::pair<bool, const char*>(false, null_ptr); return std::pair<bool, const char*>(false, null_ptr);
#if !defined(_MSC_VER)
#undef null_ptr
#endif
} }
template<typename PropertyType> template<typename PropertyType>