Ease C++ reqs (4)

rnpgp · Mar 18, 2023 · c4f7ace · c4f7ace
1 parent c7bfd03
commit c4f7ace
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,23 +102,6 @@ if(NOT MSVC)
 
 endif(NOT MSVC)
 
-
-CHECK_CXX_SOURCE_COMPILES(
-    "#include <memory>
-    int main(int argc, char**argv) {
-        return 0;
-    }
-    std::shared_ptr<int> test(void) {
-        std::shared_ptr<int> p(new int);
-        return p;
-    }"
-    CAN_RETURN_UNIQUE_PTR
-)
-
-if(CAN_RETURN_UNIQUE_PTR)
-    add_compile_definitions(RETURN_UNIQUE_PTR)
-endif(CAN_RETURN_UNIQUE_PTR)
-
 add_library(sexp STATIC
     "src/sexp-input.cpp"
     "src/sexp-output.cpp"

diff --git a/include/sexp/sexp.h b/include/sexp/sexp.h
@@ -49,15 +49,6 @@
 #include "sexp-error.h"
 
 namespace sexp {
-
-#ifdef RETURN_UNIQUE_PTR
-#define _return_unique_ptr_(p) return p
-#else
-#define _return_unique_ptr_(p) return p
-#endif
-
-// (std::move(p))
-
 /*
  * SEXP octet_t definitions
  * We maintain some presumable redundancy with ctype

diff --git a/src/sexp-input.cpp b/src/sexp-input.cpp
@@ -204,7 +204,7 @@ std::shared_ptr<sexp_object_t> sexp_input_stream_t::scan_to_eof(void)
         get_char();
     }
     s->set_string(ss);
-    return p;
+    return s;
 }
 
 /*