Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

api_connection.hpp: Rename member variable api -> _api to avoid conflicting with type name

Browse source
This commit is contained in:
theoreticalbts 2016-08-12 15:23:17 -04:00
parent f3e69d81a9
commit 894d784523
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/fc/rpc/api_connection.hpp
View file

@ -168,7 +168,7 @@ namespace fc {
struct api_visitor struct api_visitor
{ {
api_visitor( generic_api& a, const std::weak_ptr<fc::api_connection>& s ):api(a),_api_con(s){ } api_visitor( generic_api& a, const std::weak_ptr<fc::api_connection>& s ):_api(a),_api_con(s){ }
template<typename Interface, typename Adaptor, typename ... Args> template<typename Interface, typename Adaptor, typename ... Args>
std::function<variant(const fc::variants&)> to_generic( const std::function<api<Interface,Adaptor>(Args...)>& f )const; std::function<variant(const fc::variants&)> to_generic( const std::function<api<Interface,Adaptor>(Args...)>& f )const;
@ -187,11 +187,11 @@ namespace fc {
template<typename Result, typename... Args> template<typename Result, typename... Args>
void operator()( const char* name, std::function<Result(Args...)>& memb )const { void operator()( const char* name, std::function<Result(Args...)>& memb )const {
api._methods.emplace_back( to_generic( memb ) ); _api._methods.emplace_back( to_generic( memb ) );
api._by_name[name] = api._methods.size() - 1; _api._by_name[name] = _api._methods.size() - 1;
} }
generic_api& api; generic_api& _api;
const std::weak_ptr<fc::api_connection>& _api_con; const std::weak_ptr<fc::api_connection>& _api_con;
}; };
@ -382,7 +382,7 @@ namespace fc {
const std::function<fc::api<Interface,Adaptor>(Args...)>& f )const const std::function<fc::api<Interface,Adaptor>(Args...)>& f )const
{ {
auto api_con = _api_con; auto api_con = _api_con;
auto gapi = &api; auto gapi = &_api;
return [=]( const variants& args ) { return [=]( const variants& args ) {
auto con = api_con.lock(); auto con = api_con.lock();
FC_ASSERT( con, "not connected" ); FC_ASSERT( con, "not connected" );
@ -396,7 +396,7 @@ namespace fc {
const std::function<fc::optional<fc::api<Interface,Adaptor>>(Args...)>& f )const const std::function<fc::optional<fc::api<Interface,Adaptor>>(Args...)>& f )const
{ {
auto api_con = _api_con; auto api_con = _api_con;
auto gapi = &api; auto gapi = &_api;
return [=]( const variants& args )-> fc::variant { return [=]( const variants& args )-> fc::variant {
auto con = api_con.lock(); auto con = api_con.lock();
FC_ASSERT( con, "not connected" ); FC_ASSERT( con, "not connected" );
@ -413,7 +413,7 @@ namespace fc {
const std::function<fc::api_ptr(Args...)>& f )const const std::function<fc::api_ptr(Args...)>& f )const
{ {
auto api_con = _api_con; auto api_con = _api_con;
auto gapi = &api; auto gapi = &_api;
return [=]( const variants& args ) -> fc::variant { return [=]( const variants& args ) -> fc::variant {
auto con = api_con.lock(); auto con = api_con.lock();
FC_ASSERT( con, "not connected" ); FC_ASSERT( con, "not connected" );
@ -428,7 +428,7 @@ namespace fc {
template<typename R, typename ... Args> template<typename R, typename ... Args>
std::function<variant(const fc::variants&)> generic_api::api_visitor::to_generic( const std::function<R(Args...)>& f )const std::function<variant(const fc::variants&)> generic_api::api_visitor::to_generic( const std::function<R(Args...)>& f )const
{ {
generic_api* gapi = &api; generic_api* gapi = &_api;
return [f,gapi]( const variants& args ) { return [f,gapi]( const variants& args ) {
return variant( gapi->call_generic( f, args.begin(), args.end() ) ); return variant( gapi->call_generic( f, args.begin(), args.end() ) );
}; };
@ -437,7 +437,7 @@ namespace fc {
template<typename ... Args> template<typename ... Args>
std::function<variant(const fc::variants&)> generic_api::api_visitor::to_generic( const std::function<void(Args...)>& f )const std::function<variant(const fc::variants&)> generic_api::api_visitor::to_generic( const std::function<void(Args...)>& f )const
{ {
generic_api* gapi = &api; generic_api* gapi = &_api;
return [f,gapi]( const variants& args ) { return [f,gapi]( const variants& args ) {
gapi->call_generic( f, args.begin(), args.end() ); gapi->call_generic( f, args.begin(), args.end() );
return variant(); return variant();