diff options
author | Brad King <brad.king@kitware.com> | 2014-03-14 13:30:21 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-14 13:30:21 (GMT) |
commit | e623605ed6e7f4645c124e4ad3c07ef3e7a7682d (patch) | |
tree | f89548474209a17d9540744cb9f4ab03d5e4ee30 | |
parent | 9a026b902b7c7c263e6c3a70f755f974e8953132 (diff) | |
parent | 328c217960ac3ee92270739a2dc4fc9d566789c3 (diff) | |
download | CMake-e623605ed6e7f4645c124e4ad3c07ef3e7a7682d.zip CMake-e623605ed6e7f4645c124e4ad3c07ef3e7a7682d.tar.gz CMake-e623605ed6e7f4645c124e4ad3c07ef3e7a7682d.tar.bz2 |
Merge topic 'doc-cmake-developer-no-cmStdString'
328c2179 Help: Drop cmStdString from cmake-developer(7) examples
-rw-r--r-- | Help/manual/cmake-developer.7.rst | 12 |
1 files changed, 6 insertions, 6 deletions
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); |