From 967be2a4e82b1a125b26bb72a60318a4fb2b50c4 Mon Sep 17 00:00:00 2001 From: Brent Stapleton Date: Mon, 14 Jan 2019 10:35:25 -0800 Subject: uhd: mpm: apply clang-format to all files Applying formatting changes to all .cpp and .hpp files in the following directories: ``` find host/examples/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/tests/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/dboard/neon/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/dboard/magnesium/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/device3/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/mpmd/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/lib/usrp/x300/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find host/utils/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file find mpm/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file ``` Also formatted host/include/, except Cpp03 was used as a the language standard instead of Cpp11. ``` sed -i 's/ Cpp11/ Cpp03/g' .clang-format find host/include/ -iname *.hpp -o -iname *.cpp | \ xargs clang-format -i -style=file ``` Formatting style was designated by the .clang-format file. --- mpm/python/lib_helper.cpp | 22 +++--- mpm/python/pyusrp_periphs/converters.hpp | 89 +++++++++++------------ mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp | 21 +++--- mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp | 23 +++--- mpm/python/tests_periphs.cpp | 19 +++-- 5 files changed, 87 insertions(+), 87 deletions(-) (limited to 'mpm/python') diff --git a/mpm/python/lib_helper.cpp b/mpm/python/lib_helper.cpp index 2d533f073..f4ac7870d 100644 --- a/mpm/python/lib_helper.cpp +++ b/mpm/python/lib_helper.cpp @@ -5,22 +5,24 @@ // #include "lib_helper.hpp" -#include "converters.hpp" -#include "../lib/udev_helper.hpp" #include "../lib/net_helper.hpp" +#include "../lib/udev_helper.hpp" +#include "converters.hpp" #include namespace bp = boost::python; -void export_helper(){ - //Register submodule types - bp::object helper_module(bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs.helper")))); +void export_helper() +{ + // Register submodule types + bp::object helper_module( + bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs.helper")))); bp::scope().attr("helper") = helper_module; - bp::scope io_scope = helper_module; + bp::scope io_scope = helper_module; bp::class_("udev_helper", bp::init<>()) - .def("get_eeprom", &mpm::udev_helper::get_eeprom) - ; - bp::to_python_converter, iterable_to_python_list >, false>(); + .def("get_eeprom", &mpm::udev_helper::get_eeprom); + bp::to_python_converter, + iterable_to_python_list>, + false>(); } - diff --git a/mpm/python/pyusrp_periphs/converters.hpp b/mpm/python/pyusrp_periphs/converters.hpp index ede9507a9..849e8b90e 100644 --- a/mpm/python/pyusrp_periphs/converters.hpp +++ b/mpm/python/pyusrp_periphs/converters.hpp @@ -8,32 +8,29 @@ #include #include -#include #include +#include namespace bp = boost::python; -template -struct map_to_python_dict +template struct map_to_python_dict { static PyObject* convert(MapType const& input_map) { bp::dict py_dict; - for (const auto& element: input_map){ + for (const auto& element : input_map) { py_dict[element.first] = element.second; } return bp::incref(py_dict.ptr()); } - }; -template -struct iterable_to_python_list +template struct iterable_to_python_list { static PyObject* convert(Container const& input) { bp::list py_list; - for (const auto& element: input){ + for (const auto& element : input) { py_list.append(element); } return bp::incref(py_list.ptr()); @@ -43,52 +40,48 @@ struct iterable_to_python_list // Converter for std::vector / std::list arguments from python iterables struct iterable_converter { - template - iterable_converter& - from_python() - { - bp::converter::registry::push_back( - &iterable_converter::convertible, - &iterable_converter::construct, - bp::type_id()); - return *this; - } + template iterable_converter& from_python() + { + bp::converter::registry::push_back(&iterable_converter::convertible, + &iterable_converter::construct, + bp::type_id()); + return *this; + } - static void* convertible(PyObject* object) - { - return PyObject_GetIter(object) ? object : NULL; - } + static void* convertible(PyObject* object) + { + return PyObject_GetIter(object) ? object : NULL; + } - template - static void construct( - PyObject* object, - bp::converter::rvalue_from_python_stage1_data* data) - { - // Object is a borrowed reference, so create a handle indicting it is - // borrowed for proper reference counting. - bp::handle<> handle(bp::borrowed(object)); + template + static void construct( + PyObject* object, bp::converter::rvalue_from_python_stage1_data* data) + { + // Object is a borrowed reference, so create a handle indicting it is + // borrowed for proper reference counting. + bp::handle<> handle(bp::borrowed(object)); - // Obtain a handle to the memory block that the converter has allocated - // for the C++ type. - typedef bp::converter::rvalue_from_python_storage - storage_type; - void* storage = reinterpret_cast(data)->storage.bytes; + // Obtain a handle to the memory block that the converter has allocated + // for the C++ type. + typedef bp::converter::rvalue_from_python_storage storage_type; + void* storage = reinterpret_cast(data)->storage.bytes; - typedef bp::stl_input_iterator - iterator; + typedef bp::stl_input_iterator iterator; - // Allocate the C++ type into the converter's memory block, and assign - // its handle to the converter's convertible variable. The C++ - // container is populated by passing the begin and end iterators of - // the python object to the container's constructor. - new (storage) Container( - iterator(bp::object(handle)), // begin - iterator()); // end - data->convertible = storage; - } + // Allocate the C++ type into the converter's memory block, and assign + // its handle to the converter's convertible variable. The C++ + // container is populated by passing the begin and end iterators of + // the python object to the container's constructor. + new (storage) Container(iterator(bp::object(handle)), // begin + iterator()); // end + data->convertible = storage; + } }; -void export_converter(){ +void export_converter() +{ // LIBMPM_BOOST_PREAMBLE("helper") - bp::to_python_converter, iterable_to_python_list >, false>(); + bp::to_python_converter, + iterable_to_python_list>, + false>(); } diff --git a/mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp b/mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp index b045b5909..97ccfc864 100644 --- a/mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp +++ b/mpm/python/pyusrp_periphs/e320/pyusrp_periphs.cpp @@ -7,26 +7,27 @@ // include hackery to only include boost python and define the macro here #include #define LIBMPM_PYTHON -#define LIBMPM_BOOST_PREAMBLE(module) \ - /* Register submodule types */ \ - namespace bp = boost::python; \ - bp::object py_module(bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs." module)))); \ - bp::scope().attr(module) = py_module; \ - bp::scope io_scope = py_module; +#define LIBMPM_BOOST_PREAMBLE(module) \ + /* Register submodule types */ \ + namespace bp = boost::python; \ + bp::object py_module( \ + bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs." module)))); \ + bp::scope().attr(module) = py_module; \ + bp::scope io_scope = py_module; #include "../converters.hpp" -#include -#include -#include #include #include +#include +#include +#include #include namespace bp = boost::python; BOOST_PYTHON_MODULE(libpyusrp_periphs) { - bp::object package = bp::scope(); + bp::object package = bp::scope(); package.attr("__path__") = "libpyusrp_periphs"; export_converter(); export_types(); diff --git a/mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp b/mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp index d6e66ad1e..85851677f 100644 --- a/mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp +++ b/mpm/python/pyusrp_periphs/n3xx/pyusrp_periphs.cpp @@ -7,12 +7,13 @@ // include hackery to only include boost python and define the macro here #include #define LIBMPM_PYTHON -#define LIBMPM_BOOST_PREAMBLE(module) \ - /* Register submodule types */ \ - namespace bp = boost::python; \ - bp::object py_module(bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs." module)))); \ - bp::scope().attr(module) = py_module; \ - bp::scope io_scope = py_module; +#define LIBMPM_BOOST_PREAMBLE(module) \ + /* Register submodule types */ \ + namespace bp = boost::python; \ + bp::object py_module( \ + bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs." module)))); \ + bp::scope().attr(module) = py_module; \ + bp::scope io_scope = py_module; //! RAII-style GIL release method // @@ -42,19 +43,19 @@ private: //#include "types.hpp" #include "../converters.hpp" -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include namespace bp = boost::python; BOOST_PYTHON_MODULE(libpyusrp_periphs) { - bp::object package = bp::scope(); + bp::object package = bp::scope(); package.attr("__path__") = "libpyusrp_periphs"; export_converter(); export_types(); diff --git a/mpm/python/tests_periphs.cpp b/mpm/python/tests_periphs.cpp index c0446d87a..5b4a7c24d 100644 --- a/mpm/python/tests_periphs.cpp +++ b/mpm/python/tests_periphs.cpp @@ -5,20 +5,23 @@ // #include "tests_periphs.hpp" -#include #include +#include #include namespace bp = boost::python; -void export_tests(){ - //Register submodule types - bp::object tests_module(bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs.tests")))); +void export_tests() +{ + // Register submodule types + bp::object tests_module( + bp::handle<>(bp::borrowed(PyImport_AddModule("libpyusrp_periphs.tests")))); bp::scope().attr("tests") = tests_module; - bp::scope io_scope = tests_module; + bp::scope io_scope = tests_module; - bp::class_, boost::shared_ptr >("test_spi_iface", bp::init<>()) + bp::class_, + boost::shared_ptr>("test_spi_iface", bp::init<>()) .def("make", &mpm::tests_spi_iface::make) - .staticmethod("make") - ; + .staticmethod("make"); } -- cgit v1.2.3