diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-17 17:12:56 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-04-17 17:12:56 -0700 |
| commit | b9058f111aeeae175d7ad1ef68405fe62d29a198 (patch) | |
| tree | 1a33d9bbf2b2d68604a248bbb0824013635e5001 | |
| parent | 0476c5f73c0d26c221723eb02e7eecc4df9c099c (diff) | |
| parent | 385f0d4b0a5074bc62bacd6366c4b7474db8ef40 (diff) | |
Merge branch 'next' into python3
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 2 | ||||
| -rw-r--r-- | gnuradio-runtime/include/gnuradio/rpcmanager.h | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/thread/thread_group.cc | 2 | ||||
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/tag_share.h | 15 | ||||
| -rw-r--r-- | gr-blocks/lib/tcp_server_sink_impl.h | 2 |
6 files changed, 14 insertions, 15 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index d6103ec9af..8e45c546cd 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -182,7 +182,7 @@ macro(GR_SWIG_MAKE name) endif (PYTHON3) #setup the swig flags with flags and include directories - set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -relativeimport ${py3} -module ${name} ${GR_SWIG_FLAGS}) + set(CMAKE_SWIG_FLAGS -fvirtual -modern -keyword -w511 -w314 -relativeimport ${py3} -module ${name} ${GR_SWIG_FLAGS}) #set the C++ property on the swig .i file so it builds set_source_files_properties(${ifiles} PROPERTIES CPLUSPLUS ON) diff --git a/gnuradio-runtime/include/gnuradio/rpcmanager.h b/gnuradio-runtime/include/gnuradio/rpcmanager.h index e7ee4c4942..57682ac251 100644 --- a/gnuradio-runtime/include/gnuradio/rpcmanager.h +++ b/gnuradio-runtime/include/gnuradio/rpcmanager.h @@ -54,8 +54,8 @@ class GR_RUNTIME_API rpcmanager : public virtual rpcmanager_base static bool booter_registered; static bool aggregator_registered; static void rpcserver_booter_base_sptr_dest(rpcserver_booter_base* b) {;} - static std::auto_ptr<rpcserver_booter_base> boot; - static std::auto_ptr<rpcserver_booter_aggregator> aggregator; + static std::unique_ptr<rpcserver_booter_base> boot; + static std::unique_ptr<rpcserver_booter_aggregator> aggregator; }; #endif /* RPCMANAGER_H */ diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc index fcba1ab524..2785513a46 100644 --- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc +++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc @@ -27,8 +27,8 @@ bool rpcmanager::make_aggregator(false); bool rpcmanager::booter_registered(false); bool rpcmanager::aggregator_registered(false); -std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0); -std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0); +std::unique_ptr<rpcserver_booter_base> rpcmanager::boot; +std::unique_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator; #ifdef GR_RPCSERVER_ENABLED rpcmanager manager_instance; diff --git a/gnuradio-runtime/lib/thread/thread_group.cc b/gnuradio-runtime/lib/thread/thread_group.cc index e467dfda5a..637525e19e 100644 --- a/gnuradio-runtime/lib/thread/thread_group.cc +++ b/gnuradio-runtime/lib/thread/thread_group.cc @@ -37,7 +37,7 @@ namespace gr { { // No scoped_lock required here since the only "shared data" that's // modified here occurs inside add_thread which does scoped_lock. - std::auto_ptr<boost::thread> thrd(new boost::thread(threadfunc)); + std::unique_ptr<boost::thread> thrd(new boost::thread(threadfunc)); add_thread(thrd.get()); return thrd.release(); } diff --git a/gr-blocks/include/gnuradio/blocks/tag_share.h b/gr-blocks/include/gnuradio/blocks/tag_share.h index b2d288f6a5..476076c6f5 100644 --- a/gr-blocks/include/gnuradio/blocks/tag_share.h +++ b/gr-blocks/include/gnuradio/blocks/tag_share.h @@ -1,26 +1,25 @@ /* -*- c++ -*- */ -/* +/* * Copyright 2017 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) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, * Boston, MA 02110-1301, USA. */ - #ifndef INCLUDED_BLOCKS_TAG_SHARE_H #define INCLUDED_BLOCKS_TAG_SHARE_H @@ -40,7 +39,7 @@ namespace gr { * useful when a signal is detected via a correlate_access_code_bb or * a threshold crossing from a complex_to_mag_squared block. The tag from * that detection is on the alternate stream, either bytes or floats. - * Often there is further signal processing that should be done on the + * Often there is further signal processing that should be done on the * complex stream. This block allows the detection tags to be added to * the complex stream to trigger downstream processing without the need of * redundant trigger inputs on all subsequent blocks. @@ -57,6 +56,7 @@ namespace gr { * stream type does not have to match the input/output stream type. Tags from * Input 1's items will be combined with Input 0's item tags and outputted on * Output 0. + * \param vlen The vector size of the input and output stream items */ static sptr make(size_t sizeof_io_item, size_t sizeof_share_item, size_t vlen = 1); }; @@ -65,4 +65,3 @@ namespace gr { } // namespace gr #endif /* INCLUDED_BLOCKS_TAG_SHARE_H */ - diff --git a/gr-blocks/lib/tcp_server_sink_impl.h b/gr-blocks/lib/tcp_server_sink_impl.h index d10f3b95b8..ea1aa3e84a 100644 --- a/gr-blocks/lib/tcp_server_sink_impl.h +++ b/gr-blocks/lib/tcp_server_sink_impl.h @@ -39,7 +39,7 @@ namespace gr { boost::asio::io_service d_io_service; gr::thread::thread d_io_serv_thread; boost::asio::ip::tcp::endpoint d_endpoint; - std::auto_ptr<boost::asio::ip::tcp::socket> d_socket; + std::unique_ptr<boost::asio::ip::tcp::socket> d_socket; std::set<boost::asio::ip::tcp::socket *> d_sockets; boost::asio::ip::tcp::acceptor d_acceptor; |