Just moved code into dlib namespace.

dlib/python/pybind_utils.h

@@ -10,69 +10,73 @@
 
 namespace py = pybind11;
 
-template <typename T>
-std::vector<T> python_list_to_vector (
+namespace dlib
+{
+
+    template <typename T>
+    std::vector<T> python_list_to_vector (
         const py::list& obj
-)
-/*!
+    )
+    /*!
         ensures
             - converts a python object into a std::vector<T> and returns it.
-!*/
-{
+    !*/
+    {
         std::vector<T> vect(len(obj));
         for (unsigned long i = 0; i < vect.size(); ++i)
         {
             vect[i] = obj[i].cast<T>();
         }
         return vect;
-}
+    }
 
-template <typename T>
-py::list vector_to_python_list (
+    template <typename T>
+    py::list vector_to_python_list (
         const std::vector<T>& vect
-)
-/*!
+    )
+    /*!
         ensures
             - converts a std::vector<T> into a python list object.
-!*/
-{
+    !*/
+    {
         py::list obj;
         for (unsigned long i = 0; i < vect.size(); ++i)
             obj.append(vect[i]);
         return obj;
-}
+    }
 
-template <typename T>
-void extend_vector_with_python_list (
+    template <typename T>
+    void extend_vector_with_python_list (
         std::vector<T> &v,
         const py::list &l
-)
-/*!
+    )
+    /*!
         ensures
             - appends items from a python list to the end of std::vector<T>.
-!*/
-{
+    !*/
+    {
         for (const auto &item : l)
             v.push_back(item.cast<T>());
-}
+    }
 
 // ----------------------------------------------------------------------------------------
 
-template <typename T>
-std::shared_ptr<T> load_object_from_file (
+    template <typename T>
+    std::shared_ptr<T> load_object_from_file (
         const std::string& filename
-)
-/*!
+    )
+    /*!
         ensures
             - deserializes an object of type T from the given file and returns it.
-!*/
-{
+    !*/
+    {
         std::ifstream fin(filename.c_str(), std::ios::binary);
         if (!fin)
             throw dlib::error("Unable to open " + filename);
         auto obj = std::make_shared<T>();
         deserialize(*obj, fin);
         return obj;
+    }
 }
 
 // ----------------------------------------------------------------------------------------

dlib/python/serialize_pickle.h

@@ -8,9 +8,14 @@
 #include <sstream>
 #include <dlib/vectorstream.h>
 
-template<typename T>
-py::tuple getstate(const T& item)
+namespace py = pybind11;
+
+namespace dlib
 {
+
+    template<typename T>
+    py::tuple getstate(const T& item)
+    {
         using namespace dlib;
         std::vector<char> buf;
         buf.reserve(5000);
@@ -18,11 +23,11 @@ py::tuple getstate(const T& item)
         serialize(item, sout);
         return py::make_tuple(py::handle(
                 PyBytes_FromStringAndSize(buf.size()?&buf[0]:0, buf.size())));
-}
+    }
 
-template<typename T>
-T setstate(py::tuple state)
-{
+    template<typename T>
+    T setstate(py::tuple state)
+    {
         using namespace dlib;
         if (len(state) != 1)
         {
@@ -60,6 +65,8 @@ T setstate(py::tuple state)
         }
 
         return item;
+    }
+
 }
 
 #endif // DLIB_SERIALIZE_PiCKLE_Hh_