Skip to content

Commit 4b39412

Browse files
authored
Merge pull request #16 from freebsd/revert-15-cxx11
Revert "Remove support below C++11"
2 parents d42d603 + 7f0bcbb commit 4b39412

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

debug.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@
3333
#define LUTOK_DEBUG_HPP
3434

3535
#include <string>
36+
#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
3637
#include <memory>
38+
#else
39+
#include <tr1/memory>
40+
#endif
3741

3842
namespace lutok {
3943

@@ -55,7 +59,11 @@ class debug {
5559
struct impl;
5660

5761
/// Pointer to the shared internal implementation.
62+
#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
5863
std::shared_ptr< impl > _pimpl;
64+
#else
65+
std::tr1::shared_ptr< impl > _pimpl;
66+
#endif
5967

6068
public:
6169
debug(void);

m4/compiler-features.m4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ AC_DEFUN([KYUA_REQUIRE_CXX], [
4444
if test "${atf_cv_prog_cxx_works}" = no; then
4545
AC_MSG_ERROR([C++ compiler cannot create executables])
4646
fi
47-
48-
AX_CXX_COMPILE_STDCXX_11([], [])
4947
])
5048

5149
dnl

state.hpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434

3535
#include <string>
3636

37+
#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
3738
#include <memory>
39+
#else
40+
#include <tr1/memory>
41+
#endif
3842

3943
namespace lutok {
4044

@@ -73,7 +77,11 @@ class state {
7377
struct impl;
7478

7579
/// Pointer to the shared internal implementation.
80+
#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
7681
std::shared_ptr< impl > _pimpl;
82+
#else
83+
std::tr1::shared_ptr< impl > _pimpl;
84+
#endif
7785

7886
void* new_userdata_voidp(const size_t);
7987
void* to_userdata_voidp(const int);

0 commit comments

Comments
 (0)