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 ff55f7c75c495605547a97d3bac88ddaaa263a69 (commit)
via 109df55042f80220a995c41e9b59a42728a4479d (commit)
from 5ec42eaf96b0088cd5b3e989e7458b73b65e5951 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff55f7c75c495605547a97d3bac88ddaaa263a69
commit ff55f7c75c495605547a97d3bac88ddaaa263a69
Merge: 5ec42ea 109df55
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 13 13:08:59 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Jun 13 13:08:59 2016 -0400
Merge topic 'xcode-mig-support' into next
109df550 fixup! Xcode: Add const qualifiers
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=109df55042f80220a995c41e9b59a42728a4479d
commit 109df55042f80220a995c41e9b59a42728a4479d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jun 13 13:08:17 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Jun 13 13:08:17 2016 -0400
fixup! Xcode: Add const qualifiers
diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h
index 9a17ae4..ed917af 100644
--- a/Source/cmXCodeObject.h
+++ b/Source/cmXCodeObject.h
@@ -112,7 +112,7 @@ public:
cmXCodeObject* GetObject(const char* name) const
{
std::map<std::string, cmXCodeObject*>::const_iterator i =
- this->ObjectAttributes.find(name);
+ this->ObjectAttributes.find(name);
if (i != this->ObjectAttributes.end()) {
return i->second;
}
@@ -149,7 +149,10 @@ public:
{
return this->DependTargets;
}
- std::vector<cmXCodeObject*> const& GetObjectList() const { return
this->List; }
+ std::vector<cmXCodeObject*> const& GetObjectList() const
+ {
+ return this->List;
+ }
void SetComment(const std::string& c) { this->Comment = c; }
static void PrintString(std::ostream& os, std::string String);
-----------------------------------------------------------------------
Summary of changes:
Source/cmXCodeObject.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
