Skip to content

Commit 5ed4396

Browse files
committed
Renaming ALL_GCC macro back to just GCC (because there is no OLD anymore, luckily).
1 parent 8a55d0d commit 5ed4396

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

include/pybind11/attr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,14 +517,14 @@ template <size_t Nurse, size_t Patient> struct process_attribute<keep_alive<Nurs
517517
template <typename... Args> struct process_attributes {
518518
static void init(const Args&... args, function_record *r) {
519519
PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(r);
520-
PYBIND11_WORKAROUND_INCORRECT_ALL_GCC_UNUSED_BUT_SET_PARAMETER(r);
520+
PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(r);
521521
using expander = int[];
522522
(void) expander{
523523
0, ((void) process_attribute<typename std::decay<Args>::type>::init(args, r), 0)...};
524524
}
525525
static void init(const Args&... args, type_record *r) {
526526
PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(r);
527-
PYBIND11_WORKAROUND_INCORRECT_ALL_GCC_UNUSED_BUT_SET_PARAMETER(r);
527+
PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(r);
528528
using expander = int[];
529529
(void) expander{0,
530530
(process_attribute<typename std::decay<Args>::type>::init(args, r), 0)...};
@@ -537,7 +537,7 @@ template <typename... Args> struct process_attributes {
537537
}
538538
static void postcall(function_call &call, handle fn_ret) {
539539
PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(call, fn_ret);
540-
PYBIND11_WORKAROUND_INCORRECT_ALL_GCC_UNUSED_BUT_SET_PARAMETER(fn_ret);
540+
PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(fn_ret);
541541
using expander = int[];
542542
(void) expander{
543543
0, (process_attribute<typename std::decay<Args>::type>::postcall(call, fn_ret), 0)...};

include/pybind11/cast.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ template <template<typename...> class Tuple, typename... Ts> class tuple_caster
609609
template <typename T, size_t... Is>
610610
static handle cast_impl(T &&src, return_value_policy policy, handle parent, index_sequence<Is...>) {
611611
PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100(src, policy, parent);
612-
PYBIND11_WORKAROUND_INCORRECT_ALL_GCC_UNUSED_BUT_SET_PARAMETER(policy, parent);
612+
PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(policy, parent);
613613
std::array<object, size> entries{{
614614
reinterpret_steal<object>(make_caster<Ts>::cast(std::get<Is>(std::forward<T>(src)), policy, parent))...
615615
}};

include/pybind11/detail/common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,10 +941,10 @@ inline void silence_unused_warnings(Args &&...) {}
941941

942942
// GCC -Wunused-but-set-parameter
943943
#if defined(__GNUG__) && !defined(__clang__) && !defined(__INTEL_COMPILER)
944-
# define PYBIND11_WORKAROUND_INCORRECT_ALL_GCC_UNUSED_BUT_SET_PARAMETER(...) \
944+
# define PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(...) \
945945
detail::silence_unused_warnings(__VA_ARGS__)
946946
#else
947-
# define PYBIND11_WORKAROUND_INCORRECT_ALL_GCC_UNUSED_BUT_SET_PARAMETER(...)
947+
# define PYBIND11_WORKAROUND_INCORRECT_GCC_UNUSED_BUT_SET_PARAMETER(...)
948948
#endif
949949

950950
#if defined(_MSC_VER) // All versions (as of July 2021).

0 commit comments

Comments
 (0)