diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-10 17:02:19 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-10 17:02:19 +0000 |
| commit | 6dc910cce4694950c3e29275d0eb733d7abfc749 (patch) | |
| tree | c6803b57736097704188559221fee7a3974b43b9 | |
| parent | 8edecdc67d0352711465c8cca5cb239faad8c330 (diff) | |
| download | chromium_src-6dc910cce4694950c3e29275d0eb733d7abfc749.zip chromium_src-6dc910cce4694950c3e29275d0eb733d7abfc749.tar.gz chromium_src-6dc910cce4694950c3e29275d0eb733d7abfc749.tar.bz2 | |
Include the Version class in the 64 bit version of base. This is needed so that it can be used from client_utils.cc which is included in both the chrome target and the chrome_nacl_win64 target.
BUG=61609
TEST=None
Review URL: http://codereview.chromium.org/4676002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65674 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/base.gypi | 4 | ||||
| -rw-r--r-- | base/version.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/base/base.gypi b/base/base.gypi index ee1f5c9..bca077a4 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -280,6 +280,8 @@ 'utf_string_conversions.h', 'values.cc', 'values.h', + 'version.cc', + 'version.h', 'vlog.cc', 'vlog.h', 'waitable_event.h', @@ -488,8 +490,6 @@ 'sync_socket_posix.cc', 'time_mac.cc', 'time_posix.cc', - 'version.cc', - 'version.h', ], 'conditions': [ [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { diff --git a/base/version.cc b/base/version.cc index 9fbcb6a..fe224eb 100644 --- a/base/version.cc +++ b/base/version.cc @@ -63,8 +63,8 @@ int Version::CompareTo(const Version& other) const { const std::string Version::GetString() const { DCHECK(is_valid_); std::string version_str; - int count = components_.size(); - for (int i = 0; i < count - 1; ++i) { + size_t count = components_.size(); + for (size_t i = 0; i < count - 1; ++i) { version_str.append(base::IntToString(components_[i])); version_str.append("."); } |