diff --git a/src/Type.cc b/src/Type.cc index 5341476a3f..402aee2505 100644 --- a/src/Type.cc +++ b/src/Type.cc @@ -599,12 +599,9 @@ TypePtr SetType::ShallowClone() { return make_intrusive(indices, elemen SetType::~SetType() = default; -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" FuncType::Capture::Capture(detail::IDPtr _id, bool _deep_copy) : id(std::move(_id)), deep_copy(_deep_copy) { is_managed = id ? ZVal::IsManagedType(id->GetType()) : false; } -#pragma GCC diagnostic pop FuncType::FuncType(RecordTypePtr arg_args, TypePtr arg_yield, FunctionFlavor arg_flavor) : Type(TYPE_FUNC), args(std::move(arg_args)), arg_types(make_intrusive()), yield(std::move(arg_yield)) { diff --git a/src/Type.h b/src/Type.h index 7261a445f4..c5c52bc095 100644 --- a/src/Type.h +++ b/src/Type.h @@ -513,8 +513,6 @@ public: public: Capture(detail::IDPtr _id, bool _deep_copy); -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" Capture(const Capture&) = default; Capture(Capture&&) = default; Capture& operator=(const Capture&) = default; @@ -527,11 +525,11 @@ public: // For script optimization: void SetID(detail::IDPtr new_id) { id = std::move(new_id); } -#pragma GCC diagnostic pop - [[deprecated("Remove in v7.1. Use non-default constructor and associated accessors.")]] detail::IDPtr id; - [[deprecated("Remove in v7.1. Use non-default constructor and associated accessors.")]] bool deep_copy; - [[deprecated("Remove in v7.1. Use non-default constructor and associated accessors.")]] bool is_managed; + private: + detail::IDPtr id; + bool deep_copy; + bool is_managed; }; using CaptureList = std::vector;