mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-26 07:02:11 +00:00
Merge branch 'master' into smart_holder
This commit is contained in:
commit
fb7452ce39
15
.clang-tidy
15
.clang-tidy
@ -2,12 +2,17 @@ FormatStyle: file
|
||||
|
||||
Checks: '
|
||||
llvm-namespace-comment,
|
||||
modernize-use-override,
|
||||
readability-container-size-empty,
|
||||
modernize-use-using,
|
||||
modernize-use-equals-default,
|
||||
modernize-avoid-bind,
|
||||
modernize-replace-auto-ptr,
|
||||
modernize-replace-disallow-copy-and-assign-macro,
|
||||
modernize-shrink-to-fit,
|
||||
modernize-use-auto,
|
||||
modernize-use-equals-default,
|
||||
modernize-use-equals-delete,
|
||||
modernize-use-emplace,
|
||||
modernize-use-override,
|
||||
modernize-use-using,
|
||||
readability-container-size-empty,
|
||||
'
|
||||
|
||||
CheckOptions:
|
||||
@ -15,3 +20,5 @@ CheckOptions:
|
||||
value: 'exception_ptr$;'
|
||||
|
||||
HeaderFilterRegex: 'pybind11/.*h'
|
||||
|
||||
WarningsAsErrors: '*'
|
||||
|
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@ -152,7 +152,7 @@ jobs:
|
||||
# MSVC, but for now, this action works:
|
||||
- name: Prepare compiler environment for Windows 🐍 2.7
|
||||
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:
|
||||
arch: x64
|
||||
|
||||
@ -742,7 +742,7 @@ jobs:
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
||||
- name: Prepare MSVC
|
||||
uses: ilammy/msvc-dev-cmd@v1.8.1
|
||||
uses: ilammy/msvc-dev-cmd@v1.9.0
|
||||
with:
|
||||
arch: x86
|
||||
|
||||
@ -788,7 +788,7 @@ jobs:
|
||||
uses: jwlawson/actions-setup-cmake@v1.9
|
||||
|
||||
- name: Prepare MSVC
|
||||
uses: ilammy/msvc-dev-cmd@v1.8.1
|
||||
uses: ilammy/msvc-dev-cmd@v1.9.0
|
||||
with:
|
||||
toolset: 14.0
|
||||
|
||||
|
@ -20,12 +20,12 @@ class TestFactory1 {
|
||||
TestFactory1() : value("(empty)") { print_default_created(this); }
|
||||
TestFactory1(int v) : value(std::to_string(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(const TestFactory1 &) = delete;
|
||||
TestFactory1 &operator=(TestFactory1 &&) = delete;
|
||||
TestFactory1 &operator=(const TestFactory1 &) = delete;
|
||||
public:
|
||||
std::string value;
|
||||
~TestFactory1() { print_destroyed(this); }
|
||||
};
|
||||
// Non-public construction, but moveable:
|
||||
|
@ -201,7 +201,7 @@ Using ``find_package`` with version info is not recommended except for release v
|
||||
@PACKAGE_INIT@
|
||||
|
||||
# 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_DEFINITIONS USING_pybind11)
|
||||
|
Loading…
Reference in New Issue
Block a user