walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Replace steady_clock with monotonic_clock if steady_clock is not available

This commit is contained in:
Tatsuhiro Tsujikawa 2013-09-17 22:48:30 +09:00
parent 0a649e2499
commit 8dcaa08405
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -80,6 +80,26 @@ AM_PATH_PYTHON([2.6],, [:])
AX_CXX_COMPILE_STDCXX_11([noext], [optional]) AX_CXX_COMPILE_STDCXX_11([noext], [optional])
# 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_LANG_PUSH(C++)
AC_MSG_CHECKING([whether std::chrono::steady_clock is available])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
[[
#include <chrono>
]],
[[
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])])
AC_LANG_POP()
# Checks for libraries. # Checks for libraries.
# Additional libraries required for tests. # Additional libraries required for tests.

6
src/nghttp2_config.h
View File

@ -29,4 +29,10 @@
# include <config.h> # include <config.h>
#endif // HAVE_CONFIG_H #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 #endif // NGHTTP2_CONFIG_H