diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 23:55:07 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 23:55:07 +0000 |
| commit | b6dfee7efa35c3b7a790d8900467080f71be2cc9 (patch) | |
| tree | 52cadfc5b7ac934b228f5f726758274e6502fd5a /src | |
| parent | f19450f3ad156e1dea624b4d37e645bef067ab5c (diff) | |
| download | googletest-b6dfee7efa35c3b7a790d8900467080f71be2cc9.tar.gz | |
Refactors the scons script (by Vlad Losev).
Fixes a typo in __GNUC__ (by Zhanyong Wan).
git-svn-id: http://googletest.googlecode.com/svn/trunk@323 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest-internal-inl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h index 9a366fe..47aec22 100644 --- a/src/gtest-internal-inl.h +++ b/src/gtest-internal-inl.h @@ -1198,14 +1198,14 @@ bool ParseNaturalNumber(const ::std::string& str, Integer* number) { char* end; // BiggestConvertible is the largest integer type that system-provided // string-to-number conversion routines can return. -#if GTEST_OS_WINDOWS && !defined(__GNU_C__) +#if GTEST_OS_WINDOWS && !defined(__GNUC__) // MSVC and C++ Builder define __int64 instead of the standard long long. typedef unsigned __int64 BiggestConvertible; const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10); #else typedef unsigned long long BiggestConvertible; // NOLINT const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10); -#endif // GTEST_OS_WINDOWS && !defined(__GNU_C__) +#endif // GTEST_OS_WINDOWS && !defined(__GNUC__) const bool parse_success = *end == '\0' && errno == 0; // TODO(vladl@google.com): Convert this to compile time assertion when it is |