diff --git a/ndn-cxx/detail/nonstd/scope-lite.hpp b/ndn-cxx/detail/nonstd/scope-lite.hpp index 83ed338c..1cfb7833 100644 --- a/ndn-cxx/detail/nonstd/scope-lite.hpp +++ b/ndn-cxx/detail/nonstd/scope-lite.hpp @@ -886,6 +886,8 @@ make_scope_success( EF && exit_function ) // unique_resource: +#if 0 // https://github.com/martinmoene/scope-lite/issues/15 + template< class R, class D > class unique_resource { @@ -1130,8 +1132,8 @@ class unique_resource } scope_is_delete_access: - unique_resource & operator=( unique_resource const & ) scope_is_delete; - unique_resource( unique_resource const & ) scope_is_delete; + unique_resource & operator=( unique_resource const & ) scope_is_delete; + unique_resource( unique_resource const & ) scope_is_delete; private: R1 resource; @@ -1206,6 +1208,8 @@ scope_noexcept_op #endif // scope_HAVE_DEFAULT_FUNCTION_TEMPLATE_ARG +#endif // https://github.com/martinmoene/scope-lite/issues/15 + #else // #if scope_USE_POST_CPP98_VERSION // @@ -1396,7 +1400,7 @@ class unique_resource try { reset(); - resource = r; + resource = r; execute_on_reset = true; } catch(...) @@ -1481,12 +1485,10 @@ namespace nonstd using scope::scope_exit; using scope::scope_fail; using scope::scope_success; - using scope::unique_resource; using scope::make_scope_exit; using scope::make_scope_fail; using scope::make_scope_success; - using scope::make_unique_resource_checked; } #endif // scope_USES_STD_SCOPE diff --git a/ndn-cxx/util/scope.hpp b/ndn-cxx/util/scope.hpp index 9133eda6..daea8fe3 100644 --- a/ndn-cxx/util/scope.hpp +++ b/ndn-cxx/util/scope.hpp @@ -1,6 +1,6 @@ /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* - * Copyright (c) 2013-2021 Regents of the University of California. + * Copyright (c) 2013-2024 Regents of the University of California. * * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions). * @@ -30,12 +30,10 @@ namespace ndn { using ::nonstd::scope_exit; using ::nonstd::scope_fail; using ::nonstd::scope_success; -using ::nonstd::unique_resource; using ::nonstd::make_scope_exit; using ::nonstd::make_scope_fail; using ::nonstd::make_scope_success; -using ::nonstd::make_unique_resource_checked; } // namespace ndn