diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:20:09 -0400 |
| commit | bbfc759914da80214fabc70fbbed1edaf39f9e4b (patch) | |
| tree | 712eb6d1d95445bb6535534ce86d7faf1bfe6f90 /gnuradio-runtime/include/gnuradio/rpcserver_ice.h | |
| parent | 3f469513b94ac992138360caca7e1b53f82214ae (diff) | |
| parent | 597b93798a804cde1783d6d2ab53b348d57c44cd (diff) | |
Merge branch 'maint'
Diffstat (limited to 'gnuradio-runtime/include/gnuradio/rpcserver_ice.h')
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/rpcserver_ice.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_ice.h b/gnuradio-runtime/include/gnuradio/rpcserver_ice.h index c1c3d46a42..260c7f06b5 100644 --- a/gnuradio-runtime/include/gnuradio/rpcserver_ice.h +++ b/gnuradio-runtime/include/gnuradio/rpcserver_ice.h @@ -1,9 +1,9 @@ /* -*- c++ -*- */ -/* +/* * Copyright 2012 Free Software Foundation, Inc. * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) @@ -62,7 +62,7 @@ private: QueryCallbackMap_t d_getcallbackmap; template<typename T, typename TMap> struct set_f - : public std::unary_function<T,void> + : public std::unary_function<T,void> { set_f(const Ice::Current& _c, TMap& _setcallbackmap, const priv_lvl_t& _cur_priv) : c(_c), d_setcallbackmap(_setcallbackmap), cur_priv(_cur_priv) @@ -98,7 +98,7 @@ private: const priv_lvl_t& _cur_priv, GNURadio::KnobMap& _outknobs) : c(_c), d_getcallbackmap(_getcallbackmap), cur_priv(_cur_priv), outknobs(_outknobs) {} - + void operator()(const T& p) { QueryCallbackMap_t::const_iterator iter(d_getcallbackmap.find(p)); |