[Cmake-commits] CMake branch, next, updated. v2.8.12-3654-g2fdb710

[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  2fdb710b7eb214a001d28209eb2d30c4e75cc5a5 (commit)
       via  f59693b971819c0442657ed025ff009da6217103 (commit)
       via  1a39f857f705604818b81ed38a3d7de2d1b66fa6 (commit)
      from  fe9a6a71cfd30510ca465a5b5600f44ebc46331e (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=2fdb710b7eb214a001d28209eb2d30c4e75cc5a5
commit 2fdb710b7eb214a001d28209eb2d30c4e75cc5a5
Merge: fe9a6a7 f59693b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 09:57:43 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 8 09:57:43 2013 -0400

    Merge topic 'update-kwsys' into next
    
    f59693b Merge branch 'upstream-kwsys' into update-kwsys
    1a39f85 KWSys 2013-10-08 (96b2f6f4)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f59693b971819c0442657ed025ff009da6217103
commit f59693b971819c0442657ed025ff009da6217103
Merge: 4340507 1a39f85
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 8 09:53:13 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 8 09:53:13 2013 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a39f857f705604818b81ed38a3d7de2d1b66fa6
commit 1a39f857f705604818b81ed38a3d7de2d1b66fa6
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Tue Oct 8 08:29:16 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 8 09:53:08 2013 -0400

    KWSys 2013-10-08 (96b2f6f4)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 96b2f6f4 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' deec6b8a..96b2f6f4
    Adrien Destugues (2):
          2b303bd7 SystemTools: Remove outdated preprocessor checks for Haiku
          96b2f6f4 DynamicLoader: Cleanup test include files for Haiku
    
    Rolf Eike Beer (1):
          dbc8fa1b SystemInformation: fix truncation warnings
    
    Change-Id: I25364f58d62dd73fde0f7625d9d77ed0d4726e33

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index beefd7d..7c31f3a 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -1734,12 +1734,12 @@ int SystemInformationImplementation::GetFullyQualifiedDomainName(
       {
       char host[NI_MAXHOST]={'\0'};
 
-      socklen_t addrlen
+      const size_t addrlen
         = (fam==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6));
 
       ierr=getnameinfo(
             ifa->ifa_addr,
-            addrlen,
+            static_cast<socklen_t>(addrlen),
             host,
             NI_MAXHOST,
             NULL,
@@ -3836,7 +3836,8 @@ bool SystemInformationImplementation::QueryLinuxMemory()
     unsigned long temp;
     unsigned long cachedMem;
     unsigned long buffersMem;
-    char *r=fgets(buffer, sizeof(buffer), fd); // Skip "total: used:..."
+    // Skip "total: used:..."
+    char *r=fgets(buffer, static_cast<int>(sizeof(buffer)), fd);
     int status=0;
     if(r==buffer)
       {
diff --git a/SystemTools.cxx b/SystemTools.cxx
index e9a1fd3..749002d 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -152,11 +152,6 @@ public:
 #define _chdir chdir
 #endif
 
-#if defined(__HAIKU__)
-#include <os/kernel/OS.h>
-#include <os/storage/Path.h>
-#endif
-
 #if defined(__BEOS__) && !defined(__ZETA__)
 #include <be/kernel/OS.h>
 #include <be/storage/Path.h>
diff --git a/testDynamicLoader.cxx b/testDynamicLoader.cxx
index dd6d603..1bff707 100644
--- a/testDynamicLoader.cxx
+++ b/testDynamicLoader.cxx
@@ -15,14 +15,10 @@
 #include KWSYS_HEADER(ios/iostream)
 #include KWSYS_HEADER(stl/string)
 
-#if defined(__BEOS__)
+#if defined(__BEOS__) || defined(__HAIKU__)
 #include <be/kernel/OS.h>  /* disable_debugger() API. */
 #endif
 
-#if defined(__HAIKU__)
-#include <os/kernel/OS.h>  /* disable_debugger() API. */
-#endif
-
 // Work-around CMake dependency scanning limitation.  This must
 // duplicate the above list of headers.
 #if 0

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

Summary of changes:
 Source/kwsys/SystemInformation.cxx |    7 ++++---
 Source/kwsys/SystemTools.cxx       |    5 -----
 Source/kwsys/testDynamicLoader.cxx |    6 +-----
 3 files changed, 5 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
CMake