[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-865-gc59de1e

[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  c59de1e8cdf53bfa429a53f7875258c7893f4df1 (commit)
       via  c2af447d445d87bf4b09a051b2cf78d39667dce7 (commit)
      from  1676d12a7206f87deb4d54d5826315165331c764 (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=c59de1e8cdf53bfa429a53f7875258c7893f4df1
commit c59de1e8cdf53bfa429a53f7875258c7893f4df1
Merge: 1676d12 c2af447
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 25 10:35:28 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 25 10:35:28 2014 -0500

    Merge topic 'doc-drop-borland-workaround' into next
    
    c2af447d Remove disallowed feature which Borland did not accept.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c2af447d445d87bf4b09a051b2cf78d39667dce7
commit c2af447d445d87bf4b09a051b2cf78d39667dce7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 23:15:16 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 25 10:34:47 2014 -0500

    Remove disallowed feature which Borland did not accept.

diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst
index 34e3225..0b06173 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -73,28 +73,6 @@ The return value of ``find()`` must be assigned to an intermediate
     // ...
     }
 
-Char Array to ``string`` Conversions with Algorithms
-----------------------------------------------------
-
-In some implementations, algorithms operating on iterators to a container of
-``std::string`` can not accept a ``const char*`` value:
-
-.. code-block:: c++
-
-  const char* dir = /*...*/;
-  std::vector<std::string> vec;
-  // ...
-  std::binary_search(vec.begin(), vec.end(), dir); // Wrong
-
-The ``std::string`` may need to be explicitly constructed:
-
-.. code-block:: c++
-
-  const char* dir = /*...*/;
-  std::vector<std::string> vec;
-  // ...
-  std::binary_search(vec.begin(), vec.end(), std::string(dir)); // Ok
-
 std::auto_ptr
 -------------
 

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

Summary of changes:


hooks/post-receive
-- 
CMake