diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-02 14:23:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-02 14:23:17 (GMT) |
| commit | c5cc3441b379e2bc6e70efd6dbd530edebbf0024 (patch) | |
| tree | de0c2a39648c936039b7c86886cbe49c04b92923 /Source/kwsys/testSystemInformation.cxx | |
| parent | 72c11e590273d100c49f472afc3a7569b233ff00 (diff) | |
| parent | 1b79433a6d7cdd1da1a0af74240f2299c78e4112 (diff) | |
| download | CMake-c5cc3441b379e2bc6e70efd6dbd530edebbf0024.zip CMake-c5cc3441b379e2bc6e70efd6dbd530edebbf0024.tar.gz CMake-c5cc3441b379e2bc6e70efd6dbd530edebbf0024.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/testSystemInformation.cxx')
| -rw-r--r-- | Source/kwsys/testSystemInformation.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/kwsys/testSystemInformation.cxx b/Source/kwsys/testSystemInformation.cxx index fc8ea55..c96751a 100644 --- a/Source/kwsys/testSystemInformation.cxx +++ b/Source/kwsys/testSystemInformation.cxx @@ -11,15 +11,15 @@ ============================================================================*/ #include "kwsysPrivate.h" #include KWSYS_HEADER(SystemInformation.hxx) -#include KWSYS_HEADER(ios/iostream) // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 # include "SystemInformation.hxx.in" -# include "kwsys_ios_iostream.h.in" #endif +#include <iostream> + #if defined(KWSYS_USE_LONG_LONG) # if defined(KWSYS_IOS_HAS_OSTREAM_LONG_LONG) # define iostreamLongLong(x) (x) @@ -36,18 +36,18 @@ # error "No Long Long" #endif -#define printMethod(info, m) kwsys_ios::cout << #m << ": " \ +#define printMethod(info, m) std::cout << #m << ": " \ << info.m() << "\n" -#define printMethod2(info, m, unit) kwsys_ios::cout << #m << ": " \ +#define printMethod2(info, m, unit) std::cout << #m << ": " \ << info.m() << " " << unit << "\n" -#define printMethod3(info, m, unit) kwsys_ios::cout << #m << ": " \ +#define printMethod3(info, m, unit) std::cout << #m << ": " \ << iostreamLongLong(info.m) << " " << unit << "\n" int testSystemInformation(int, char*[]) { - kwsys_ios::cout << "CTEST_FULL_OUTPUT\n"; // avoid truncation + std::cout << "CTEST_FULL_OUTPUT\n"; // avoid truncation kwsys::SystemInformation info; info.RunCPUCheck(); @@ -93,16 +93,16 @@ int testSystemInformation(int, char*[]) { if (info.DoesCPUSupportFeature(static_cast<long int>(1) << i)) { - kwsys_ios::cout << "CPU feature " << i << "\n"; + std::cout << "CPU feature " << i << "\n"; } } /* test stack trace */ - kwsys_ios::cout - << "Program Stack:" << kwsys_ios::endl - << kwsys::SystemInformation::GetProgramStack(0,0) << kwsys_ios::endl - << kwsys_ios::endl; + std::cout + << "Program Stack:" << std::endl + << kwsys::SystemInformation::GetProgramStack(0,0) << std::endl + << std::endl; /* test segv handler info.SetStackTraceOnError(1); |