[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2650-gf5fd061
Brad King
brad.king at kitware.com
Tue Jun 18 08:13:57 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via f5fd0617df8646b063b4909e183801c47e25df16 (commit)
via 09ec083f93ec999401bbe8a204027bdc28d0eccf (commit)
from 5716ce2ab6bbcb594082be0c0a31f100c00384c5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5fd0617df8646b063b4909e183801c47e25df16
commit f5fd0617df8646b063b4909e183801c47e25df16
Merge: 5716ce2 09ec083
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 18 08:13:46 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 18 08:13:46 2013 -0400
Merge topic 'add-cmake_host_system_information-command' into next
09ec083 Use size_t instead of std::size_t
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09ec083f93ec999401bbe8a204027bdc28d0eccf
commit 09ec083f93ec999401bbe8a204027bdc28d0eccf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 18 08:00:58 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 18 08:00:58 2013 -0400
Use size_t instead of std::size_t
The latter does not exist on older compilers.
diff --git a/Source/cmCMakeHostSystemInformationCommand.cxx b/Source/cmCMakeHostSystemInformationCommand.cxx
index 8c29871..62f2383 100644
--- a/Source/cmCMakeHostSystemInformationCommand.cxx
+++ b/Source/cmCMakeHostSystemInformationCommand.cxx
@@ -40,7 +40,7 @@ bool cmCMakeHostSystemInformationCommand
info.RunMemoryCheck();
std::string result_list;
- for(std::size_t i = current_index + 1; i < args.size(); ++i)
+ for(size_t i = current_index + 1; i < args.size(); ++i)
{
std::string key = args[i];
if(i != current_index + 1)
@@ -105,7 +105,7 @@ bool cmCMakeHostSystemInformationCommand
}
std::string cmCMakeHostSystemInformationCommand
-::ValueToString(std::size_t value) const
+::ValueToString(size_t value) const
{
cmsys_ios::stringstream tmp;
tmp << value;
diff --git a/Source/cmCMakeHostSystemInformationCommand.h b/Source/cmCMakeHostSystemInformationCommand.h
index da0dc45..d1b8700 100644
--- a/Source/cmCMakeHostSystemInformationCommand.h
+++ b/Source/cmCMakeHostSystemInformationCommand.h
@@ -94,7 +94,7 @@ private:
bool GetValue(cmsys::SystemInformation &info,
std::string const& key, std::string &value);
- std::string ValueToString(std::size_t value) const;
+ std::string ValueToString(size_t value) const;
std::string ValueToString(const char *value) const;
std::string ValueToString(std::string const& value) const;
};
-----------------------------------------------------------------------
Summary of changes:
Source/cmCMakeHostSystemInformationCommand.cxx | 4 ++--
Source/cmCMakeHostSystemInformationCommand.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list