[Cmake-commits] CMake branch, next, updated. v2.8.7-2723-g263d9bd
Eric Noulard
eric.noulard at gmail.com
Sat Feb 18 18:04:13 EST 2012
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 263d9bdd64621370b1da991d7e3f0a3334643099 (commit)
via 9a8103e929de7569fd2e5459a6676dff64d88892 (commit)
from b6012df7ad7145d35769aad98910cdd28c640302 (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=263d9bdd64621370b1da991d7e3f0a3334643099
commit 263d9bdd64621370b1da991d7e3f0a3334643099
Merge: b6012df 9a8103e
Author: Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Sat Feb 18 18:04:07 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Feb 18 18:04:07 2012 -0500
Merge topic 'CPack-dynamicDocSection' into next
9a8103e Try to fix compile error on Win32-vs70
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a8103e929de7569fd2e5459a6676dff64d88892
commit 9a8103e929de7569fd2e5459a6676dff64d88892
Author: Eric NOULARD <eric.noulard at gmail.com>
AuthorDate: Sun Feb 19 00:01:39 2012 +0100
Commit: Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Sun Feb 19 00:01:39 2012 +0100
Try to fix compile error on Win32-vs70
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index 1fb8ab6..904a157 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -16,6 +16,7 @@
#include <cmsys/Directory.hxx>
#include <cmsys/Glob.hxx>
+#include <algorithm>
//----------------------------------------------------------------------------
static const char *cmDocumentationStandardOptions[][3] =
@@ -746,9 +747,9 @@ void cmDocumentation::addCPackStandardDocSections()
void cmDocumentation::addAutomaticVariableSections(const std::string& section)
{
std::vector<std::string>::iterator it;
- it = find(this->VariableSections.begin(),
- this->VariableSections.end(),
- section);
+ it = std::find(this->VariableSections.begin(),
+ this->VariableSections.end(),
+ section);
/* if the section does not exist then add it */
if (it==this->VariableSections.end())
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmDocumentation.cxx | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list