[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-995-g8e9638f

[Brad King]

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  8e9638fb9829dd4239e6dde59c94ad03c21283e9 (commit)
       via  328c217960ac3ee92270739a2dc4fc9d566789c3 (commit)
      from  216fb9d9d1835cfb658686ddbe7bface46f7639a (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=8e9638fb9829dd4239e6dde59c94ad03c21283e9
commit 8e9638fb9829dd4239e6dde59c94ad03c21283e9
Merge: 216fb9d 328c217
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 15:15:11 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 13 15:15:11 2014 -0400

    Merge topic 'doc-cmake-developer-no-cmStdString' into next
    
    328c2179 Help: Drop cmStdString from cmake-developer(7) examples


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=328c217960ac3ee92270739a2dc4fc9d566789c3
commit 328c217960ac3ee92270739a2dc4fc9d566789c3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 15:11:08 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 13 15:11:22 2014 -0400

    Help: Drop cmStdString from cmake-developer(7) examples
    
    The type no longer exists within CMake.

diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 376b56c..d025d63 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -55,7 +55,7 @@ used in a comparison with the iterator returned by ``end()``:
 
 .. code-block:: c++
 
-  const std::set<cmStdString>& someSet = getSet();
+  const std::set<std::string>& someSet = getSet();
   if (someSet.find("needle") == someSet.end()) // Wrong
     {
     // ...
@@ -66,8 +66,8 @@ The return value of ``find()`` must be assigned to an intermediate
 
 .. code-block:: c++
 
-  const std::set<cmStdString>& someSet;
-  const std::set<cmStdString>::const_iterator i = someSet.find("needle");
+  const std::set<std::string>& someSet;
+  const std::set<std::string>::const_iterator i = someSet.find("needle");
   if (i != propSet.end()) // Ok
     {
     // ...
@@ -110,7 +110,7 @@ conversion is not allowed:
 
 .. code-block:: c++
 
-  std::set<cmStdString> theSet;
+  std::set<const char*> theSet;
   std::vector<std::string> theVector;
   theVector.insert(theVector.end(), theSet.begin(), theSet.end()); // Wrong
 
@@ -118,9 +118,9 @@ A loop must be used instead:
 
 .. code-block:: c++
 
-  std::set<cmStdString> theSet;
+  std::set<const char*> theSet;
   std::vector<std::string> theVector;
-  for(std::set<cmStdString>::iterator li = theSet.begin();
+  for(std::set<const char*>::iterator li = theSet.begin();
       li != theSet.end(); ++li)
     {
     theVector.push_back(*li);

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-developer.7.rst |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake