[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-173-g7c8ee66

[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  7c8ee666ec64e2429a4e68ae397fa0ec38ba6a1a (commit)
       via  eb4e40a70597ae444a3a753f50099bea24b80ae8 (commit)
       via  643a7dab9df5cb3fff55a9caaf2e1837f9acd753 (commit)
      from  e74e07ffd1826be46539aa5c7cd864e10aca5f80 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c8ee666ec64e2429a4e68ae397fa0ec38ba6a1a
commit 7c8ee666ec64e2429a4e68ae397fa0ec38ba6a1a
Merge: e74e07f eb4e40a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 08:29:49 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 7 08:29:49 2016 -0400

    Merge topic 'mips-rld-map-rel' into next
    
    eb4e40a7 fixup! cmSystemTools, elf: handle DT_MIPS_RLD_REL_MAP in RemoveRPath
    643a7dab fixup! cmSystemTools: rewrite RemoveRPath using DyanmicEntryList methods


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb4e40a70597ae444a3a753f50099bea24b80ae8
commit eb4e40a70597ae444a3a753f50099bea24b80ae8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 08:21:55 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 7 08:21:55 2016 -0400

    fixup! cmSystemTools, elf: handle DT_MIPS_RLD_REL_MAP in RemoveRPath

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 557797e..d800ef8 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2537,7 +2537,7 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg,
     }
 
     // Get size of one DYNAMIC entry
-    int sizeof_dentry =
+    unsigned long const sizeof_dentry =
       elf.GetDynamicEntryPosition(1) - elf.GetDynamicEntryPosition(0);
 
     // Adjust the entry list as necessary to remove the run path

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=643a7dab9df5cb3fff55a9caaf2e1837f9acd753
commit 643a7dab9df5cb3fff55a9caaf2e1837f9acd753
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 7 08:21:48 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 7 08:21:48 2016 -0400

    fixup! cmSystemTools: rewrite RemoveRPath using DyanmicEntryList methods

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 29dde2d..557797e 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -2541,7 +2541,7 @@ bool cmSystemTools::RemoveRPath(std::string const& file, std::string* emsg,
       elf.GetDynamicEntryPosition(1) - elf.GetDynamicEntryPosition(0);
 
     // Adjust the entry list as necessary to remove the run path
-    int entriesErased = 0;
+    unsigned long entriesErased = 0;
     for (cmELF::DynamicEntryList::iterator it = dentries.begin();
          it != dentries.end();) {
       if (it->first == cmELF::TagRPath || it->first == cmELF::TagRunPath) {

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

Summary of changes:
 Source/cmSystemTools.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake