Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-29 16:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into smart_holder

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-06-19 15:52:36 -07:00
commit fb7452ce39
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.clang-tidy
View File

@ -2,12 +2,17 @@ FormatStyle: file
Checks: ' Checks: '
llvm-namespace-comment, llvm-namespace-comment,
modernize-use-override, modernize-avoid-bind,
readability-container-size-empty, modernize-replace-auto-ptr,
modernize-use-using, modernize-replace-disallow-copy-and-assign-macro,
modernize-use-equals-default, modernize-shrink-to-fit,
modernize-use-auto, modernize-use-auto,
modernize-use-equals-default,
modernize-use-equals-delete,
modernize-use-emplace, modernize-use-emplace,
modernize-use-override,
modernize-use-using,
readability-container-size-empty,
' '
CheckOptions: CheckOptions:
@ -15,3 +20,5 @@ CheckOptions:
value: 'exception_ptr$;' value: 'exception_ptr$;'
HeaderFilterRegex: 'pybind11/.*h' HeaderFilterRegex: 'pybind11/.*h'
WarningsAsErrors: '*'

6
.github/workflows/ci.yml vendored
View File

@ -152,7 +152,7 @@ jobs:
# MSVC, but for now, this action works: # MSVC, but for now, this action works:
- name: Prepare compiler environment for Windows 🐍 2.7 - name: Prepare compiler environment for Windows 🐍 2.7
if: matrix.python == 2.7 && runner.os == 'Windows' if: matrix.python == 2.7 && runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1.8.1 uses: ilammy/msvc-dev-cmd@v1.9.0
with: with:
arch: x64 arch: x64
@ -742,7 +742,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1.9 uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare MSVC - name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.8.1 uses: ilammy/msvc-dev-cmd@v1.9.0
with: with:
arch: x86 arch: x86
@ -788,7 +788,7 @@ jobs:
uses: jwlawson/actions-setup-cmake@v1.9 uses: jwlawson/actions-setup-cmake@v1.9
- name: Prepare MSVC - name: Prepare MSVC
uses: ilammy/msvc-dev-cmd@v1.8.1 uses: ilammy/msvc-dev-cmd@v1.9.0
with: with:
toolset: 14.0 toolset: 14.0

4
tests/test_factory_constructors.cpp
View File

@ -20,12 +20,12 @@ class TestFactory1 {
TestFactory1() : value("(empty)") { print_default_created(this); } TestFactory1() : value("(empty)") { print_default_created(this); }
TestFactory1(int v) : value(std::to_string(v)) { print_created(this, value); } TestFactory1(int v) : value(std::to_string(v)) { print_created(this, value); }
TestFactory1(std::string v) : value(std::move(v)) { print_created(this, value); } TestFactory1(std::string v) : value(std::move(v)) { print_created(this, value); }
public:
std::string value;
TestFactory1(TestFactory1 &&) = delete; TestFactory1(TestFactory1 &&) = delete;
TestFactory1(const TestFactory1 &) = delete; TestFactory1(const TestFactory1 &) = delete;
TestFactory1 &operator=(TestFactory1 &&) = delete; TestFactory1 &operator=(TestFactory1 &&) = delete;
TestFactory1 &operator=(const TestFactory1 &) = delete; TestFactory1 &operator=(const TestFactory1 &) = delete;
public:
std::string value;
~TestFactory1() { print_destroyed(this); } ~TestFactory1() { print_destroyed(this); }
}; };
// Non-public construction, but moveable: // Non-public construction, but moveable:

2
tools/pybind11Config.cmake.in
View File

@ -201,7 +201,7 @@ Using ``find_package`` with version info is not recommended except for release v
@PACKAGE_INIT@ @PACKAGE_INIT@
# Location of pybind11/pybind11.h # Location of pybind11/pybind11.h
set(pybind11_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@") set(pybind11_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
set(pybind11_LIBRARY "") set(pybind11_LIBRARY "")
set(pybind11_DEFINITIONS USING_pybind11) set(pybind11_DEFINITIONS USING_pybind11)