diff options
| author | Ted Kremenek <kremenek@apple.com> | 2010-03-03 01:02:48 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2010-03-03 01:02:48 +0000 |
| commit | 47307292f1c04f1a76cae5b8033da4610b2a8827 (patch) | |
| tree | b4978b5d1a2fca2802851e99a4854ca9347c3b68 /clang/lib/Basic/Version.cpp | |
| parent | 6b11b4e050f23ef151df97045503a7c4353e0cf1 (diff) | |
| download | llvm-47307292f1c04f1a76cae5b8033da4610b2a8827.zip llvm-47307292f1c04f1a76cae5b8033da4610b2a8827.tar.gz llvm-47307292f1c04f1a76cae5b8033da4610b2a8827.tar.bz2 | |
Make getClangRevision() check that SVN_VERSION is an empty string
(even if it is defined). This fixes the issue of this function
returning '0' when SVN_VERSION is defined to be "".
Fixes: <rdar://problem/7663667>
llvm-svn: 97620
Diffstat (limited to 'clang/lib/Basic/Version.cpp')
| -rw-r--r-- | clang/lib/Basic/Version.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/Basic/Version.cpp b/clang/lib/Basic/Version.cpp index 434ddf3..0c58b60 100644 --- a/clang/lib/Basic/Version.cpp +++ b/clang/lib/Basic/Version.cpp @@ -40,15 +40,15 @@ llvm::StringRef getClangRepositoryPath() { } std::string getClangRevision() { -#ifndef SVN_REVISION - // Subversion was not available at build time? - return ""; -#else - std::string revision; - llvm::raw_string_ostream OS(revision); - OS << strtol(SVN_REVISION, 0, 10); - return revision; +#ifdef SVN_REVISION + if (SVN_VERSION[0] != '\0') { + std::string revision; + llvm::raw_string_ostream OS(revision); + OS << strtol(SVN_REVISION, 0, 10); + return revision; + } #endif + return ""; } std::string getClangFullRepositoryVersion() { |