Merge pull request #16 from freebsd/revert-15-cxx11

Revert "Remove support below C++11"
freebsd · Mar 12, 2024 · 4b39412 · 4b39412
2 parents d42d603 + 7f0bcbb
commit 4b39412
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/debug.hpp b/debug.hpp
@@ -33,7 +33,11 @@
 #define LUTOK_DEBUG_HPP
 
 #include <string>
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
 #include <memory>
+#else
+#include <tr1/memory>
+#endif
 
 namespace lutok {
 
@@ -55,7 +59,11 @@ class debug {
     struct impl;
 
     /// Pointer to the shared internal implementation.
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
     std::shared_ptr< impl > _pimpl;
+#else
+    std::tr1::shared_ptr< impl > _pimpl;
+#endif
 
 public:
     debug(void);

diff --git a/m4/compiler-features.m4 b/m4/compiler-features.m4
@@ -44,8 +44,6 @@ AC_DEFUN([KYUA_REQUIRE_CXX], [
     if test "${atf_cv_prog_cxx_works}" = no; then
         AC_MSG_ERROR([C++ compiler cannot create executables])
     fi
-
-    AX_CXX_COMPILE_STDCXX_11([], [])
 ])
 
 dnl

diff --git a/state.hpp b/state.hpp
@@ -34,7 +34,11 @@
 
 #include <string>
 
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
 #include <memory>
+#else
+#include <tr1/memory>
+#endif
 
 namespace lutok {
 
@@ -73,7 +77,11 @@ class state {
     struct impl;
 
     /// Pointer to the shared internal implementation.
+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
     std::shared_ptr< impl > _pimpl;
+#else
+    std::tr1::shared_ptr< impl > _pimpl;
+#endif
 
     void* new_userdata_voidp(const size_t);
     void* to_userdata_voidp(const int);
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,8 +44,6 @@ AC_DEFUN([KYUA_REQUIRE_CXX], [ @@
         if test "${atf_cv_prog_cxx_works}" = no; then
             AC_MSG_ERROR([C++ compiler cannot create executables])
         fi
-        AX_CXX_COMPILE_STDCXX_11([], [])
     ])
     dnl
@@ Expand Down @@