Skip to content

Commit af0d4ca

Browse files
committed
Fixing up after git rebase -X theirs master
1 parent 2fade63 commit af0d4ca

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

include/pybind11/detail/common.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,10 @@
106106
# define PYBIND11_NOINLINE_DISABLED
107107
#endif
108108

109-
// Note: Forward declarations should never be `inline`:
109+
// The PYBIND11_NOINLINE macro is for function DEFINITIONS.
110+
// In contrast, FORWARD DECLARATIONS should never use this macro:
110111
// https://stackoverflow.com/questions/9317473/forward-declaration-of-inline-functions
111-
#if defined(PYBIND11_NOINLINE_DISABLED)
112+
#if defined(PYBIND11_NOINLINE_DISABLED) // Option for maximum portability and experimentation.
112113
# define PYBIND11_NOINLINE inline
113114
#elif defined(_MSC_VER)
114115
# define PYBIND11_NOINLINE __declspec(noinline) inline

include/pybind11/pytypes.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ class type;
2828
struct arg; struct arg_v;
2929

3030
PYBIND11_NAMESPACE_BEGIN(detail)
31-
3231
class args_proxy;
3332
bool isinstance_generic(handle obj, const std::type_info &tp);
34-
std::string error_string();
3533

3634
// Accessor forward declarations
3735
template <typename Policy> class accessor;
@@ -322,6 +320,10 @@ template <typename T> T reinterpret_borrow(handle h) { return {h, object::borrow
322320
\endrst */
323321
template <typename T> T reinterpret_steal(handle h) { return {h, object::stolen_t{}}; }
324322

323+
PYBIND11_NAMESPACE_BEGIN(detail)
324+
std::string error_string();
325+
PYBIND11_NAMESPACE_END(detail)
326+
325327
#if defined(_MSC_VER)
326328
# pragma warning(push)
327329
# pragma warning(disable: 4275 4251) // warning C4275: An exported class was derived from a class that wasn't exported. Can be ignored when derived from a STL class.

0 commit comments

Comments
 (0)