You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2019/01/09 02:04:30 UTC
svn commit: r1850815 -
/subversion/trunk/subversion/bindings/cxx/include/svnxx/detail/future.hpp
Author: brane
Date: Wed Jan 9 02:04:30 2019
New Revision: 1850815
URL: http://svn.apache.org/viewvc?rev=1850815&view=rev
Log:
* subversion/bindings/cxx/include/svnxx/detail/future.hpp
(shared_future::shared_future,
future::future): Fix -Wshadow warning from gcc.
Modified:
subversion/trunk/subversion/bindings/cxx/include/svnxx/detail/future.hpp
Modified: subversion/trunk/subversion/bindings/cxx/include/svnxx/detail/future.hpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/cxx/include/svnxx/detail/future.hpp?rev=1850815&r1=1850814&r2=1850815&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/cxx/include/svnxx/detail/future.hpp (original)
+++ subversion/trunk/subversion/bindings/cxx/include/svnxx/detail/future.hpp Wed Jan 9 02:04:30 2019
@@ -77,8 +77,8 @@ class shared_future : private std::share
protected:
using inherited = std::shared_future<T>;
- shared_future(inherited&& that, shared_ptr shared_result) noexcept
- : inherited(that), shared_future_base(shared_result)
+ shared_future(inherited&& that, shared_ptr shared_result_) noexcept
+ : inherited(that), shared_future_base(shared_result_)
{}
public:
@@ -133,8 +133,8 @@ class future : private std::future<T>,
protected:
using inherited = std::future<T>;
- future(inherited&& that, unique_ptr&& unique_result) noexcept
- : inherited(std::move(that)), future_base(std::move(unique_result))
+ future(inherited&& that, unique_ptr&& unique_result_) noexcept
+ : inherited(std::move(that)), future_base(std::move(unique_result_))
{}
public: