Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge in 'upstream/master' (76b7f5364) #4915

Closed

Conversation

EricCousineau-TRI
Copy link
Collaborator

No description provided.

EricCousineau-TRI and others added 30 commits April 22, 2018 21:48
Since the module is named FindPythonLibsNew, PythonLibsNew_FOUND should be set appropriately.
…` and `unique_ptr<T>` for pure C++ instances and single-inheritance instances
Various fixes and improvements to mkdoc.py
Add option to suppress progress messages to stderr
We add `./tmp` to ensure we can make a commit to connect history with
upstream in a fast-forward way

# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/format.yml
#	.github/workflows/pip.yml
#	README.rst
#	docs/advanced/cast/overview.rst
#	include/pybind11/cast.h
#	include/pybind11/detail/internals.h
#	include/pybind11/detail/type_caster_base.h
#	include/pybind11/eigen.h
#	include/pybind11/pybind11.h
#	tests/test_eigen.cpp
#	tests/test_multiple_inheritance.cpp
# Conflicts:
#	.github/workflows/ci.yml
# Conflicts:
#	.github/workflows/ci.yml
#	include/pybind11/detail/type_caster_base.h
#	include/pybind11/eigen.h
#	include/pybind11/pybind11.h
# Conflicts:
#	include/pybind11/cast.h
#	include/pybind11/detail/common.h
#	include/pybind11/detail/internals.h
#	include/pybind11/detail/type_caster_base.h
#	include/pybind11/eigen.h
#	include/pybind11/numpy.h
#	include/pybind11/pybind11.h
#	include/pybind11/pytypes.h
#	tests/test_builtin_casters.cpp
#	tests/test_eigen.cpp
#	tests/test_multiple_inheritance.cpp
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/pip.yml
#	tests/test_class.cpp
#	tests/test_class.py
# Conflicts:
#	include/pybind11/eigen/matrix.h
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/format.yml
#	.github/workflows/pip.yml
#	docs/changelog.rst
#	include/pybind11/detail/common.h
#	include/pybind11/pytypes.h
#	pybind11/_version.py
Addresses compilation error for C++11
@EricCousineau-TRI EricCousineau-TRI deleted the feature-update branch November 2, 2023 15:27
@EricCousineau-TRI EricCousineau-TRI restored the feature-update branch November 2, 2023 15:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants