[Cmake-commits] CMake branch, next, updated. v3.0.2-5364-ga1bf041

[Stephen Kelly]

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  a1bf041d167b621ae46f4f27b71ab0801947abbe (commit)
       via  80bda1684d48b19a05637fe4167b5f9b1fd8ce2d (commit)
       via  1927e4bacb8e3183488c0e71a18b73aa62e5f53a (commit)
      from  d86565b9d0f0577bcf3428a74552001ca6f7534c (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=a1bf041d167b621ae46f4f27b71ab0801947abbe
commit a1bf041d167b621ae46f4f27b71ab0801947abbe
Merge: d86565b 80bda16
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 17 09:11:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 17 09:11:46 2014 -0400

    Merge topic 'minor-cleanups' into next
    
    80bda168 Simplify use of binary_search.
    1927e4ba Remove const char string comparison helper.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=80bda1684d48b19a05637fe4167b5f9b1fd8ce2d
commit 80bda1684d48b19a05637fe4167b5f9b1fd8ce2d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Aug 6 15:20:24 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 17 15:10:55 2014 +0200

    Simplify use of binary_search.
    
    A local string was created when dir was a const char*. Now dir is a
    std::string already so the dirString is vestigal.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 9a42ca2..14b5a92 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -519,9 +519,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
     iter = this->SystemIncludesCache.insert(entry).first;
     }
 
-  std::string dirString = dir;
-  return std::binary_search(iter->second.begin(), iter->second.end(),
-                            dirString);
+  return std::binary_search(iter->second.begin(), iter->second.end(), dir);
 }
 
 //----------------------------------------------------------------------------

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1927e4bacb8e3183488c0e71a18b73aa62e5f53a
commit 1927e4bacb8e3183488c0e71a18b73aa62e5f53a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 17 15:07:55 2014 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 17 15:10:25 2014 +0200

    Remove const char string comparison helper.
    
    It is now unused.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 3731502..8baf7b3 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -462,12 +462,6 @@ struct cmStrCmp {
     return strcmp(input, m_test.c_str()) == 0;
   }
 
-  // For use with binary_search
-  bool operator()(const char *str1, const char *str2) const
-  {
-    return strcmp(str1, str2) < 0;
-  }
-
 private:
   const std::string m_test;
 };

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |    4 +---
 Source/cmStandardIncludes.h  |    6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)


hooks/post-receive
-- 
CMake