diff options
| author | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-14 10:35:25 -0800 | 
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-16 11:40:23 -0800 | 
| commit | 967be2a4e82b1a125b26bb72a60318a4fb2b50c4 (patch) | |
| tree | 8a24954b54d1546dc8049a17e485adb0a605f74f /mpm/python/pyusrp_periphs/converters.hpp | |
| parent | aafe4e8b742a0e21d3818f21f34e3c8613132530 (diff) | |
| download | uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.tar.gz uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.tar.bz2 uhd-967be2a4e82b1a125b26bb72a60318a4fb2b50c4.zip | |
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.
Diffstat (limited to 'mpm/python/pyusrp_periphs/converters.hpp')
| -rw-r--r-- | mpm/python/pyusrp_periphs/converters.hpp | 89 | 
1 files changed, 41 insertions, 48 deletions
| 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 <boost/python.hpp>  #include <boost/python/stl_iterator.hpp> -#include <vector>  #include <string> +#include <vector>  namespace bp = boost::python; -template<typename MapType> -struct map_to_python_dict +template <typename MapType> 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<typename Container> -struct iterable_to_python_list +template <typename Container> 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 <typename Container> -  iterable_converter& -  from_python() -  { -    bp::converter::registry::push_back( -      &iterable_converter::convertible, -      &iterable_converter::construct<Container>, -      bp::type_id<Container>()); -    return *this; -  } +    template <typename Container> iterable_converter& from_python() +    { +        bp::converter::registry::push_back(&iterable_converter::convertible, +            &iterable_converter::construct<Container>, +            bp::type_id<Container>()); +        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 <typename Container> -  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 <typename Container> +    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<Container> -                                                                storage_type; -    void* storage = reinterpret_cast<storage_type*>(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<Container> storage_type; +        void* storage = reinterpret_cast<storage_type*>(data)->storage.bytes; -    typedef bp::stl_input_iterator<typename Container::value_type> -                                                                    iterator; +        typedef bp::stl_input_iterator<typename Container::value_type> 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<std::vector< std::string >, iterable_to_python_list<std::vector< std::string > >, false>(); +    bp::to_python_converter<std::vector<std::string>, +        iterable_to_python_list<std::vector<std::string>>, +        false>();  } | 
