Skip to content

Commit fb7452c

Browse files
committed
Merge branch 'master' into smart_holder
2 parents dca304f + d00fc62 commit fb7452c

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

.clang-tidy

+11-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@ FormatStyle: file
22

33
Checks: '
44
llvm-namespace-comment,
5-
modernize-use-override,
6-
readability-container-size-empty,
7-
modernize-use-using,
8-
modernize-use-equals-default,
5+
modernize-avoid-bind,
6+
modernize-replace-auto-ptr,
7+
modernize-replace-disallow-copy-and-assign-macro,
8+
modernize-shrink-to-fit,
99
modernize-use-auto,
10+
modernize-use-equals-default,
11+
modernize-use-equals-delete,
1012
modernize-use-emplace,
13+
modernize-use-override,
14+
modernize-use-using,
15+
readability-container-size-empty,
1116
'
1217

1318
CheckOptions:
1419
- key: performance-unnecessary-value-param.AllowedTypes
1520
value: 'exception_ptr$;'
1621

1722
HeaderFilterRegex: 'pybind11/.*h'
23+
24+
WarningsAsErrors: '*'

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
# MSVC, but for now, this action works:
153153
- name: Prepare compiler environment for Windows 🐍 2.7
154154
if: matrix.python == 2.7 && runner.os == 'Windows'
155-
uses: ilammy/msvc-dev-cmd@v1.8.1
155+
uses: ilammy/msvc-dev-cmd@v1.9.0
156156
with:
157157
arch: x64
158158

@@ -742,7 +742,7 @@ jobs:
742742
uses: jwlawson/actions-setup-cmake@v1.9
743743

744744
- name: Prepare MSVC
745-
uses: ilammy/msvc-dev-cmd@v1.8.1
745+
uses: ilammy/msvc-dev-cmd@v1.9.0
746746
with:
747747
arch: x86
748748

@@ -788,7 +788,7 @@ jobs:
788788
uses: jwlawson/actions-setup-cmake@v1.9
789789

790790
- name: Prepare MSVC
791-
uses: ilammy/msvc-dev-cmd@v1.8.1
791+
uses: ilammy/msvc-dev-cmd@v1.9.0
792792
with:
793793
toolset: 14.0
794794

tests/test_factory_constructors.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ class TestFactory1 {
2020
TestFactory1() : value("(empty)") { print_default_created(this); }
2121
TestFactory1(int v) : value(std::to_string(v)) { print_created(this, value); }
2222
TestFactory1(std::string v) : value(std::move(v)) { print_created(this, value); }
23+
public:
24+
std::string value;
2325
TestFactory1(TestFactory1 &&) = delete;
2426
TestFactory1(const TestFactory1 &) = delete;
2527
TestFactory1 &operator=(TestFactory1 &&) = delete;
2628
TestFactory1 &operator=(const TestFactory1 &) = delete;
27-
public:
28-
std::string value;
2929
~TestFactory1() { print_destroyed(this); }
3030
};
3131
// Non-public construction, but moveable:

tools/pybind11Config.cmake.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Using ``find_package`` with version info is not recommended except for release v
201201
@PACKAGE_INIT@
202202

203203
# Location of pybind11/pybind11.h
204-
set(pybind11_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/@CMAKE_INSTALL_INCLUDEDIR@")
204+
set(pybind11_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
205205

206206
set(pybind11_LIBRARY "")
207207
set(pybind11_DEFINITIONS USING_pybind11)

0 commit comments

Comments
 (0)