From c379b46a26f3ec320f70b8d08264e298f0ba5581 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Wed, 29 Jul 2015 21:18:36 +0900 Subject: [PATCH] Remove monotonic_clock replacement macro for gcc-4.6 --- configure.ac | 18 ------------------ src/nghttp2_config.h | 6 ------ 2 files changed, 24 deletions(-) diff --git a/configure.ac b/configure.ac index a9d04ad5..1bc717e6 100644 --- a/configure.ac +++ b/configure.ac @@ -170,24 +170,6 @@ AX_CXX_COMPILE_STDCXX_11([noext], [optional]) AC_LANG_PUSH(C++) -# Check that std::chrono::steady_clock is available. In particular, -# gcc 4.6 does not have one, but has monotonic_clock which is the old -# name existed in the pre-standard draft. If steady_clock is not -# available, don't define HAVE_STEADY_CLOCK and replace steady_clock -# with monotonic_clock. -AC_MSG_CHECKING([whether std::chrono::steady_clock is available]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM( -[[ -#include -]], -[[ -auto tp = std::chrono::steady_clock::now(); -]])], - [AC_DEFINE([HAVE_STEADY_CLOCK], [1], - [Define to 1 if you have the `std::chrono::steady_clock`.]) - AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])]) - # Check that std::future is available. AC_MSG_CHECKING([whether std::future is available]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM( diff --git a/src/nghttp2_config.h b/src/nghttp2_config.h index 9dede35a..7fbd3657 100644 --- a/src/nghttp2_config.h +++ b/src/nghttp2_config.h @@ -29,10 +29,4 @@ #include #endif // HAVE_CONFIG_H -// gcc 4.6 has std::chrono::monotonic_clock, which was renamed as -// std::chrono::steady_clock in C++11 standard. -#ifndef HAVE_STEADY_CLOCK -#define steady_clock monotonic_clock -#endif // !HAVE_STEADY_CLOCK - #endif // NGHTTP2_CONFIG_H