[Cmake-commits] CMake branch, next, updated. v2.8.10-765-g4e2d0a8

[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  4e2d0a8a0628eb7033aa58a5c0c99a91007b1cb4 (commit)
       via  95002ea4dbfc2a992be476d8a0caff124e65991d (commit)
      from  7623edbf9e3ca301e26274fd6e8b26d22579961a (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=4e2d0a8a0628eb7033aa58a5c0c99a91007b1cb4
commit 4e2d0a8a0628eb7033aa58a5c0c99a91007b1cb4
Merge: 7623edb 95002ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 6 09:34:06 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 6 09:34:06 2012 -0500

    Merge topic 'fix-KWSys-SystemInformation' into next
    
    95002ea Revert topic 'fix-KWSys-SystemInformation'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=95002ea4dbfc2a992be476d8a0caff124e65991d
commit 95002ea4dbfc2a992be476d8a0caff124e65991d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 6 09:27:57 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Nov 6 09:27:57 2012 -0500

    Revert topic 'fix-KWSys-SystemInformation'
    
    Revert commits:
    
    f4b58ed1 KWSys: In SystemInformation skip getifaddrs on LSB
    2ca56fd8 KWSys: Fix SystemInformation on FreeBSD
    53c3de07 KWSys: In SystemInformation skip backtrace on LSB < 4.1
    facd09c4 KWSys: In SystemInformation use kwsys_ios:: for string streams
    
    that will be replaced by merging upstream KWSys changes.

diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
index d534adb..cbd1bdc 100644
--- a/Source/kwsys/SystemInformation.cxx
+++ b/Source/kwsys/SystemInformation.cxx
@@ -74,14 +74,6 @@ typedef int siginfo_t;
 # include <errno.h> // extern int errno;
 #endif
 
-#ifdef __FreeBSD__
-# include <sys/sysctl.h>
-# include <fenv.h>
-# include <sys/socket.h>
-# include <netdb.h>
-# include <netinet/in.h>
-#endif
-
 #ifdef __APPLE__
 # include <sys/sysctl.h>
 # include <mach/vm_statistics.h>
@@ -103,14 +95,9 @@ typedef int siginfo_t;
 # include <sys/socket.h>
 # include <netdb.h>
 # include <netinet/in.h>
-# if defined(__LSB_VERSION__) /* LSB has no getifaddrs */
-#  undef KWSYS_SYS_HAS_IFADDRS_H
-# endif
 # if defined(__GNUG__)
 #  include <execinfo.h>
-#  if !(defined(__LSB_VERSION__) && __LSB_VERSION__ < 41)
-#   define KWSYS_SYSTEMINFORMATION_HAVE_BACKTRACE
-#  endif
+#  define KWSYS_SYSTEMINFORMATION_HAVE_BACKTRACE
 # endif
 # if defined(KWSYS_CXX_HAS_RLIMIT64)
 typedef struct rlimit64 ResourceLimitType;
@@ -466,7 +453,7 @@ bool SystemInformation::DoesCPUSupportFeature(long int i)
 
 kwsys_stl::string SystemInformation::GetCPUDescription()
 {
-  kwsys_ios::ostringstream oss;
+  kwsys_stl::ostringstream oss;
   oss
     << this->GetNumberOfPhysicalCPU()
     << " core ";
@@ -556,7 +543,7 @@ int SystemInformation::GetOSIsApple()
 
 kwsys_stl::string SystemInformation::GetOSDescription()
 {
-  kwsys_ios::ostringstream oss;
+  kwsys_stl::ostringstream oss;
   oss
     << this->GetOSName()
     << " "
@@ -612,7 +599,7 @@ kwsys_stl::string SystemInformation::GetMemoryDescription(
       const char *hostLimitEnvVarName,
       const char *procLimitEnvVarName)
 {
-  kwsys_ios::ostringstream oss;
+  kwsys_stl::ostringstream oss;
   oss
     << "Host Total: "
     << iostreamLongLong(this->GetHostMemoryTotal())
@@ -818,7 +805,7 @@ int NameValue(
       {
       continue;
       }
-    kwsys_ios::istringstream is(lines[i].substr(at+name.size()));
+    kwsys_stl::istringstream is(lines[i].substr(at+name.size()));
     is >> value;
     return 0;
     }
@@ -3323,7 +3310,7 @@ SystemInformationImplementation::GetProcMemoryUsed()
 #elif defined(__APPLE__)
   SystemInformation::LongLong memUsed=0;
   pid_t pid=getpid();
-  kwsys_ios::ostringstream oss;
+  kwsys_stl::ostringstream oss;
   oss << "ps -o rss= -p " << pid;
   FILE *file=popen(oss.str().c_str(),"r");
   if (file==0)
@@ -3348,7 +3335,7 @@ SystemInformationImplementation::GetProcMemoryUsed()
     {
     return -2;
     }
-  kwsys_ios::istringstream iss(oss.str());
+  kwsys_stl::istringstream iss(oss.str());
   iss >> memUsed;
   return memUsed;
 #else
@@ -4683,7 +4670,7 @@ int SystemInformationImplementation::CallSwVers(
       kwsys_stl::string &ver)
 {
 #ifdef __APPLE__
-  kwsys_ios::ostringstream oss;
+  kwsys_stl::ostringstream oss;
   oss << "sw_vers " << arg;
   FILE *f=popen(oss.str().c_str(),"r");
   if (f==0)
@@ -4697,7 +4684,7 @@ int SystemInformationImplementation::CallSwVers(
     oss << buf;
     }
   pclose(f);
-  kwsys_ios::istringstream iss(oss.str());
+  kwsys_stl::istringstream iss(oss.str());
   iss >> ver;
 #else
   // avoid C4100

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

Summary of changes:
 Source/kwsys/SystemInformation.cxx |   31 +++++++++----------------------
 1 files changed, 9 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
CMake