From 4b874616b2eda574c9e92b6e9b858c38108595f5 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 6 May 2018 13:54:10 +0000 Subject: [PATCH] Misc. typos (#1384) Found via `codespell` --- docs/advanced/cast/eigen.rst | 2 +- docs/changelog.rst | 6 +++--- include/pybind11/cast.h | 2 +- tests/test_smart_ptr.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/advanced/cast/eigen.rst b/docs/advanced/cast/eigen.rst index 9c7cbd22c..7cbeac00b 100644 --- a/docs/advanced/cast/eigen.rst +++ b/docs/advanced/cast/eigen.rst @@ -275,7 +275,7 @@ Vectors versus column/row matrices Eigen and numpy have fundamentally different notions of a vector. In Eigen, a vector is simply a matrix with the number of columns or rows set to 1 at compile time (for a column vector or row vector, respectively). Numpy, in -contast, has comparable 2-dimensional 1xN and Nx1 arrays, but *also* has +contrast, has comparable 2-dimensional 1xN and Nx1 arrays, but *also* has 1-dimensional arrays of size N. When passing a 2-dimensional 1xN or Nx1 array to Eigen, the Eigen type must diff --git a/docs/changelog.rst b/docs/changelog.rst index c559b47b5..c6ef76b59 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -597,7 +597,7 @@ Happy Christmas! being (notably dynamic attributes in custom types). `#527 `_. -* Significant work on the documentation -- in particular, the monolitic +* Significant work on the documentation -- in particular, the monolithic ``advanced.rst`` file was restructured into a easier to read hierarchical organization. `#448 `_. @@ -665,8 +665,8 @@ Happy Christmas! `_. - 3. This version of pybind11 uses a redesigned mechnism for instantiating - trempoline classes that are used to override virtual methods from within + 3. This version of pybind11 uses a redesigned mechanism for instantiating + trampoline classes that are used to override virtual methods from within Python. This led to the following user-visible syntax change: instead of .. code-block:: cpp diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h index efcdc5bac..b65d961f3 100644 --- a/include/pybind11/cast.h +++ b/include/pybind11/cast.h @@ -1204,7 +1204,7 @@ private: #else // PyPy seems to have multiple problems related to PyUnicode_UTF*: the UTF8 version // sometimes segfaults for unknown reasons, while the UTF16 and 32 versions require a - // non-const char * arguments, which is also a nuissance, so bypass the whole thing by just + // non-const char * arguments, which is also a nuisance, so bypass the whole thing by just // passing the encoding as a string value, which works properly: return PyUnicode_Decode(buffer, nbytes, UTF_N == 8 ? "utf-8" : UTF_N == 16 ? "utf-16" : "utf-32", nullptr); #endif diff --git a/tests/test_smart_ptr.cpp b/tests/test_smart_ptr.cpp index 5f2985064..61066f766 100644 --- a/tests/test_smart_ptr.cpp +++ b/tests/test_smart_ptr.cpp @@ -19,7 +19,7 @@ // ref is a wrapper for 'Object' which uses intrusive reference counting // It is always possible to construct a ref from an Object* pointer without -// possible incosistencies, hence the 'true' argument at the end. +// possible inconsistencies, hence the 'true' argument at the end. PYBIND11_DECLARE_HOLDER_TYPE(T, ref, true); // Make pybind11 aware of the non-standard getter member function namespace pybind11 { namespace detail {