[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-24-g186352a

[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  186352a2c7090d03eabde1919200bc1daadb9e4c (commit)
       via  58a4a7713233bebb5feca5985d0850d170703122 (commit)
      from  92701885ff148e94a05823d72559a31a9a8085b0 (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=186352a2c7090d03eabde1919200bc1daadb9e4c
commit 186352a2c7090d03eabde1919200bc1daadb9e4c
Merge: 9270188 58a4a77
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 4 11:19:19 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 4 11:19:19 2016 -0500

    Merge topic 'fix-pedantic-warnings' into next
    
    58a4a771 Make cmLinkInterface:: and cmGeneratorTarget::Multiplicity unsigned ints


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58a4a7713233bebb5feca5985d0850d170703122
commit 58a4a7713233bebb5feca5985d0850d170703122
Author:     Christoph Grüninger <foss at grueninger.de>
AuthorDate: Wed Feb 3 23:22:38 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 4 10:57:02 2016 -0500

    Make cmLinkInterface:: and cmGeneratorTarget::Multiplicity unsigned ints

diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 13098ad..2796fdf 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -931,7 +931,7 @@ cmComputeLinkDepends::MakePendingComponent(unsigned int component)
 //----------------------------------------------------------------------------
 int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl)
 {
-  int count = 2;
+  unsigned int count = 2;
   for(NodeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni)
     {
     if(cmGeneratorTarget const* target = this->EntryList[*ni].Target)
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index d96a32c..65c29f5 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -599,7 +599,7 @@ private:
   {
     ImportInfo(): NoSOName(false), Multiplicity(0) {}
     bool NoSOName;
-    int Multiplicity;
+    unsigned int Multiplicity;
     std::string Location;
     std::string SOName;
     std::string ImportLibrary;
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h
index b603bcc..561293e 100644
--- a/Source/cmLinkItem.h
+++ b/Source/cmLinkItem.h
@@ -73,7 +73,7 @@ struct cmLinkInterface: public cmLinkInterfaceLibraries
 
   // Number of repetitions of a strongly connected component of two
   // or more static libraries.
-  int Multiplicity;
+  unsigned int Multiplicity;
 
   // Libraries listed for other configurations.
   // Needed only for OLD behavior of CMP0003.

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

Summary of changes:
 Source/cmComputeLinkDepends.cxx |    2 +-
 Source/cmGeneratorTarget.h      |    2 +-
 Source/cmLinkItem.h             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake