From af91fa8dd29b1c184e8788975054519e867d1223 Mon Sep 17 00:00:00 2001 From: maier Date: Tue, 9 Oct 2012 14:20:27 +0000 Subject: [PATCH] Code Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@27031 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/checks/check_for_system_features.cmake | 4 ++-- deal.II/source/base/job_identifier.cc | 4 ++-- deal.II/source/base/logstream.cc | 4 ++-- deal.II/source/base/thread_management.cc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deal.II/cmake/checks/check_for_system_features.cmake b/deal.II/cmake/checks/check_for_system_features.cmake index 0ef5050f32..696f4ac21c 100644 --- a/deal.II/cmake/checks/check_for_system_features.cmake +++ b/deal.II/cmake/checks/check_for_system_features.cmake @@ -20,14 +20,14 @@ INCLUDE(TestBigEndian) # -# Check for various posix specific header files: +# Check for various posix (and linux) specific header files: # +CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) CHECK_INCLUDE_FILE("sys/resource.h" HAVE_SYS_RESOURCE_H) CHECK_INCLUDE_FILE("sys/time.h" HAVE_SYS_TIME_H) CHECK_INCLUDE_FILE("sys/times.h" HAVE_SYS_TIMES_H) CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) -CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) # diff --git a/deal.II/source/base/job_identifier.cc b/deal.II/source/base/job_identifier.cc index 1c00eaf2c2..4a1fcd420b 100644 --- a/deal.II/source/base/job_identifier.cc +++ b/deal.II/source/base/job_identifier.cc @@ -15,7 +15,7 @@ #include #include -#ifdef HAVE_GETHOSTNAME +#ifdef HAVE_UNISTD_H # include #endif @@ -34,7 +34,7 @@ JobIdentifier::JobIdentifier() time_t t = std::time(0); id = std::string("JobId "); -#if defined(HAVE_GETHOSTNAME) && !defined(DEAL_II_BROKEN_GETHOSTNAME) && !defined(DEBUG) +#if defined(HAVE_UNISTD_H) && defined(HAVE_GETHOSTNAME) char name[100]; gethostname(name,99); id += std::string(name) + std::string(" "); diff --git a/deal.II/source/base/logstream.cc b/deal.II/source/base/logstream.cc index d21815441a..9d6c83d3d6 100644 --- a/deal.II/source/base/logstream.cc +++ b/deal.II/source/base/logstream.cc @@ -53,7 +53,7 @@ LogStream::LogStream() { prefixes.push("DEAL:"); std_out->setf(std::ios::showpoint | std::ios::left); -#if defined(HAVE_TIMES) && defined(HAVE_UNISTD_H) +#if defined(HAVE_UNISTD_H) && defined(HAVE_TIMES) reference_time_val = 1./sysconf(_SC_CLK_TCK) * times(&reference_tms); #endif } @@ -454,7 +454,7 @@ void LogStream::timestamp () { struct tms current_tms; -#if defined(HAVE_TIMES) && defined(HAVE_UNISTD_H) +#if defined(HAVE_UNISTD_H) && defined(HAVE_TIMES) const clock_t tick = sysconf(_SC_CLK_TCK); const double time = 1./tick * times(¤t_tms); #else diff --git a/deal.II/source/base/thread_management.cc b/deal.II/source/base/thread_management.cc index 501274ebee..db4c00c3c6 100644 --- a/deal.II/source/base/thread_management.cc +++ b/deal.II/source/base/thread_management.cc @@ -136,7 +136,7 @@ namespace Threads { #ifdef SYS_gettid const pid_t this_id = syscall(SYS_gettid); -#elif defined(HAVE_GETPID) +#elif defined(HAVE_UNISTD_H) && defined(HAVE_GETPID) const pid_t this_id = getpid(); #else const unsigned int this_id = 0; -- 2.39.5