mirror of
https://github.com/matrix-construct/construct
synced 2024-09-28 19:58:53 +02:00
fixup! configure.ac: Add c++17 header <optional>.
This commit is contained in:
parent
a549070f05
commit
1bc4b46fbd
2 changed files with 13 additions and 1 deletions
|
@ -440,6 +440,7 @@ RB_CHK_SYSHEADER([iphlpapi.h], [IPHLPAPI_H])
|
||||||
|
|
||||||
dnl experimental
|
dnl experimental
|
||||||
RB_CHK_SYSHEADER([experimental/string_view], [EXPERIMENTAL_STRING_VIEW])
|
RB_CHK_SYSHEADER([experimental/string_view], [EXPERIMENTAL_STRING_VIEW])
|
||||||
|
RB_CHK_SYSHEADER([experimental/optional], [EXPERIMENTAL_OPTIONAL])
|
||||||
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
|
|
|
@ -93,7 +93,6 @@ extern "C" {
|
||||||
#include <RB_INC_STRING
|
#include <RB_INC_STRING
|
||||||
#include <RB_INC_CSTRING
|
#include <RB_INC_CSTRING
|
||||||
#include <RB_INC_STRING_VIEW
|
#include <RB_INC_STRING_VIEW
|
||||||
#include <RB_INC_EXPERIMENTAL_STRING_VIEW
|
|
||||||
#include <RB_INC_LOCALE
|
#include <RB_INC_LOCALE
|
||||||
#include <RB_INC_CODECVT
|
#include <RB_INC_CODECVT
|
||||||
#include <RB_INC_MAP
|
#include <RB_INC_MAP
|
||||||
|
@ -117,6 +116,10 @@ extern "C" {
|
||||||
#include <RB_INC_CONDITION_VARIABLE
|
#include <RB_INC_CONDITION_VARIABLE
|
||||||
#include <RB_INC_RANDOM
|
#include <RB_INC_RANDOM
|
||||||
#include <RB_INC_BITSET
|
#include <RB_INC_BITSET
|
||||||
|
#include <RB_INC_OPTIONAL
|
||||||
|
|
||||||
|
#include <RB_INC_EXPERIMENTAL_STRING_VIEW
|
||||||
|
#include <RB_INC_EXPERIMENTAL_OPTIONAL
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
//
|
//
|
||||||
|
@ -142,6 +145,14 @@ namespace std
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Experimental std::optional
|
||||||
|
#if __cplusplus <= 20170519 //TODO: refine
|
||||||
|
namespace std
|
||||||
|
{
|
||||||
|
using experimental::optional;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// OpenSSL
|
// OpenSSL
|
||||||
// Additional forward declarations in the extern namespace are introduced
|
// Additional forward declarations in the extern namespace are introduced
|
||||||
// by ircd/openssl.h
|
// by ircd/openssl.h
|
||||||
|
|
Loading…
Reference in a new issue