From patchwork Mon Dec 14 23:08:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 41382 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0985B3857C4D; Mon, 14 Dec 2020 23:09:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0985B3857C4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607987354; bh=vHimR4b/KNbsEcNGpyikVT9046DcrhmDgwkQfqQc6nU=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Xy0du2LyCoJ9KLyrwgVklHXOZaIQSnZUXzrFvZc10mhrpD0SUPVKMZ+Axf1PK5Xs6 8qaMa6Qzz6IWQxvN/k9qjxj47cjMp5aoVEeyX8yCqXEyYcseVc4BXvayWPDBftGmuP s/7hkFgUvN8mIklZ0aSZ7zsp+Z2MCa86/wy+grzU= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by sourceware.org (Postfix) with ESMTPS id 364F93858D29 for ; Mon, 14 Dec 2020 23:09:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 364F93858D29 Received: by mail-qt1-x849.google.com with SMTP id h7so12846197qtn.21 for ; Mon, 14 Dec 2020 15:09:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=vHimR4b/KNbsEcNGpyikVT9046DcrhmDgwkQfqQc6nU=; b=gWHzXw4aXyS7Xn8z5ghFYE08TCEgLEmj9F09SZbxi+ey4WQLa0Q401UHasuovpORLM hsH1clmxb1gsd35nf6e5RWvbJmDb35myxyXL9Pyhzn3kLgGsLIRGYhZ0r6Jr+mQlxNhR xn4wKdbaWWgYT7FAt+zm1JKYXA6OVjSS6+vMkUdMvw3i5YxZeCd1oLoNed0g6cvL/KqS ogfXarPoEWzkVyWshaKWjrXMVHlxXBkaGtd0QOTpgsbrtHPK1sIzpGDlIiZARV8qKSuy DWnVnlsLrBWChZisRGHuPRpqkySepEIHhEeVkP4d13kMdfaRkDK0kcKysGk8Lbk/2lj+ 7AEg== X-Gm-Message-State: AOAM533M/ex1f7u2l6dXmUVmnZOkza03sYvOyygmyUlUubNKoFHkDcWP WhzylO1VSjsOYX3li1/rVUjfwqPehFCs44tH3FdGzphENxdM+QLFM56g/r54qiwRbxsKoqk+g43 T0GKM51RoAGezbhIDLYv/z2RwkJbGIuy1AutoVzHTCkL6FNc6HO3FtfDIZfoenTosofBFRA8= X-Google-Smtp-Source: ABdhPJzTpeSqHdrlV2zcfbn5kXBKesiwiBSuTDs7BZrWi0TY+LlQbqgATdhztmI57I6ke2QghKnnvcn4SIKU/g== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a0c:9adc:: with SMTP id k28mr28062568qvf.42.1607987350759; Mon, 14 Dec 2020 15:09:10 -0800 (PST) Date: Mon, 14 Dec 2020 23:08:51 +0000 In-Reply-To: <20201214230855.1574934-1-maennich@google.com> Message-Id: <20201214230855.1574934-2-maennich@google.com> Mime-Version: 1.0 References: <20201214230855.1574934-1-maennich@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH 1/6] Drop C++03 compatibility layer To: libabigail@sourceware.org X-Spam-Status: No, score=-22.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" Now with C++11 as minimum standard, we can drop the facilities required to support earlier standards. Hence purge the use of std::tr1 from the sources. * include/abg-cxx-compat.h: remove compatibility with pre C++11. * include/abg-ir.h: Remove mention of std::tr1 from comments. * include/abg-sptr-utils.h: Likewise. Signed-off-by: Matthias Maennich --- include/abg-cxx-compat.h | 32 -------------------------------- include/abg-ir.h | 4 ++-- include/abg-sptr-utils.h | 4 ++-- 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h index 46b2ac3aa564..1d5dab48be75 100644 --- a/include/abg-cxx-compat.h +++ b/include/abg-cxx-compat.h @@ -8,26 +8,13 @@ #ifndef __ABG_CXX_COMPAT_H #define __ABG_CXX_COMPAT_H -#if __cplusplus >= 201103L - #include #include #include #include -#else - -#include -#include -#include -#include - -#endif - namespace abg_compat { -#if __cplusplus >= 201103L - // using std::hash; @@ -43,25 +30,6 @@ using std::unordered_map; // using std::unordered_set; -#else - -// -using std::tr1::hash; - -// -using std::tr1::shared_ptr; -using std::tr1::weak_ptr; -using std::tr1::dynamic_pointer_cast; -using std::tr1::static_pointer_cast; - -// -using std::tr1::unordered_map; - -// -using std::tr1::unordered_set; - -#endif - } #endif // __ABG_CXX_COMPAT_H diff --git a/include/abg-ir.h b/include/abg-ir.h index 165b336aacee..11af6b00647d 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -35,7 +35,7 @@ /// How objects' lifetime is handled in libabigail. /// /// For memory management and garbage collection of libabigail's IR -/// artifacts, we use std::tr1::shared_ptr and std::tr1::weak_ptr. +/// artifacts, we use std::shared_ptr and std::weak_ptr. /// /// When manipulating these IR artifacts, there are a few rules to keep in /// mind. @@ -90,7 +90,7 @@ namespace abigail namespace ir { -// Inject some std::tr1 types in here. +// Inject some std types in here. using abg_compat::unordered_map; /// A convenience typedef fo r an ordered set of size_t. diff --git a/include/abg-sptr-utils.h b/include/abg-sptr-utils.h index 8259c8e11f21..3f328522a153 100644 --- a/include/abg-sptr-utils.h +++ b/include/abg-sptr-utils.h @@ -5,7 +5,7 @@ /// @file /// -/// Utilities to ease the wrapping of C types into std::tr1::shared_ptr +/// Utilities to ease the wrapping of C types into std::shared_ptr #ifndef __ABG_SPTR_UTILS_H__ #define __ABG_SPTR_UTILS_H__ @@ -17,7 +17,7 @@ namespace abigail { -/// Namespace for the utilities to wrap C types into std::tr1::shared_ptr. +/// Namespace for the utilities to wrap C types into std::shared_ptr. namespace sptr_utils { From patchwork Mon Dec 14 23:08:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 41383 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 537EB385800E; Mon, 14 Dec 2020 23:09:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 537EB385800E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607987357; bh=gPjOxo87F0f+Hxr+q/szZvL9BhlSh8QOHHTdMUzk72I=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=v+uJT7xbiml92sF+U6k9MOMEtFSz6hYvwWU3YfXqkNtMqTQX7OHsukpy7mnXJGFcZ 1TpnDR5qXtGQeK8o0wjfQW39hMgI1iNO/z/8oHaDgcGF0o5931dalVl0/wzXptQlcW z31aWABcfP98d4H7n77lvjr1hsoE8e0Zds14kqE8= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by sourceware.org (Postfix) with ESMTPS id 5CD7B3858D29 for ; Mon, 14 Dec 2020 23:09:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5CD7B3858D29 Received: by mail-qt1-x849.google.com with SMTP id l17so12879494qtj.18 for ; Mon, 14 Dec 2020 15:09:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=gPjOxo87F0f+Hxr+q/szZvL9BhlSh8QOHHTdMUzk72I=; b=AIi9jqekhQOw0G8bldYIPFAyT0BYN6erinmWdwqDlAn0YfwYTYyhFzY9/r9xmrJBIH QCxy4e26KHbGmrzQxw5emqARVNLMNSubVCVY1b84ZvT2/YQ4c68erIk98S1lXwikkXjG k73b/MrQSWd2nvR4YeIql/ihkCXBakEUoBl0EBmaMPSOEbkI0rvHBqkzN17clOXG+BdG mrz8rdvwOU9UXoC6VbAUNNWUFBrPN32SnHDn8EdBIEOH9+FKr5aj4Ut5eI84qaddq7De t576sT/WkOQfUh4WByQcQeDdyNIKQnC93iYyFWeTX+Rz9HyRzBAerjT0AZU43pmKBb1c oq+w== X-Gm-Message-State: AOAM530pMchNhsWctWDsDNJOKUx+/y0zX6omGaMN/64LMaQ/EB82NXS8 RS0wldcPP1GLLUrFblVHPAZT6Bc4OYUMant5z5/MsWAii0agM31LuYq5cWcDprruG2BPrWDsCP0 o7HpgPJd3MZUx3ObWc/Zf+Mh1fMiHMtiPEyoiIGBEQSAH5cbDBetlFj/XDRrJeiy9nZ8V8xc= X-Google-Smtp-Source: ABdhPJzI2nc/5D9BBLaa3RVJjv0iB5MUMhC4VYDQszD9NsOXhBem8JCI1XQnko97YMAO6Omy5gd4RK/7BwxwCg== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a05:6214:768:: with SMTP id f8mr34283716qvz.1.1607987352869; Mon, 14 Dec 2020 15:09:12 -0800 (PST) Date: Mon, 14 Dec 2020 23:08:52 +0000 In-Reply-To: <20201214230855.1574934-1-maennich@google.com> Message-Id: <20201214230855.1574934-3-maennich@google.com> Mime-Version: 1.0 References: <20201214230855.1574934-1-maennich@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH 2/6] Remove usages from abg_compat To: libabigail@sourceware.org X-Spam-Status: No, score=-22.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" std::hash is now provided through the language standard, hence remove the compatibility code for and adjust all users accordingly. * include/abg-cxx-compat.h: Drop compatibility layer for . * include/abg-interned-str.h: migrate abg_compat use to std. * include/abg-ir.h: Likewise. * src/abg-hash.cc: Likewise. * src/abg-ir.cc: Likewise. Signed-off-by: Matthias Maennich --- include/abg-cxx-compat.h | 4 -- include/abg-interned-str.h | 3 +- include/abg-ir.h | 3 +- src/abg-hash.cc | 85 +++++++++++++++++++------------------- src/abg-ir.cc | 19 +++++---- 5 files changed, 57 insertions(+), 57 deletions(-) diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h index 1d5dab48be75..f3c343dfd481 100644 --- a/include/abg-cxx-compat.h +++ b/include/abg-cxx-compat.h @@ -8,16 +8,12 @@ #ifndef __ABG_CXX_COMPAT_H #define __ABG_CXX_COMPAT_H -#include #include #include #include namespace abg_compat { -// -using std::hash; - // using std::shared_ptr; using std::weak_ptr; diff --git a/include/abg-interned-str.h b/include/abg-interned-str.h index 6967704f1ff4..dc1adf1fb290 100644 --- a/include/abg-interned-str.h +++ b/include/abg-interned-str.h @@ -16,6 +16,7 @@ #ifndef __ABG_INTERNED_STR_H__ #define __ABG_INTERNED_STR_H__ +#include #include #include #include "abg-cxx-compat.h" @@ -211,7 +212,7 @@ struct hash_interned_string size_t operator()(const interned_string& s) const { - abg_compat::hash hash_size_t; + std::hash hash_size_t; return hash_size_t(reinterpret_cast(s.raw())); } }; // end struct hash_interned_string diff --git a/include/abg-ir.h b/include/abg-ir.h index 11af6b00647d..561d20960ed4 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -18,6 +18,7 @@ #include #include #include +#include #include #include "abg-cxx-compat.h" #include "abg-fwd.h" @@ -362,7 +363,7 @@ struct type_or_decl_hash operator()(const type_or_decl_base *artifact) const { string repr = get_pretty_representation(artifact); - abg_compat::hash do_hash; + std::hash do_hash; return do_hash(repr); } diff --git a/src/abg-hash.cc b/src/abg-hash.cc index 7addb0161fe6..7b54c177379a 100644 --- a/src/abg-hash.cc +++ b/src/abg-hash.cc @@ -5,6 +5,7 @@ /// @file +#include #include "abg-cxx-compat.h" #include "abg-internal.h" // @@ -94,8 +95,8 @@ using namespace abigail::ir; size_t type_base::hash::operator()(const type_base& t) const { - abg_compat::hash size_t_hash; - abg_compat::hash str_hash; + std::hash size_t_hash; + std::hash str_hash; size_t v = str_hash(typeid(t).name()); v = hashing::combine_hashes(v, size_t_hash(t.get_size_in_bits())); @@ -127,7 +128,7 @@ struct decl_base::hash size_t operator()(const decl_base& d) const { - abg_compat::hash str_hash; + std::hash str_hash; size_t v = str_hash(typeid(d).name()); if (!d.get_linkage_name().empty()) @@ -150,7 +151,7 @@ struct type_decl::hash { decl_base::hash decl_hash; type_base::hash type_hash; - abg_compat::hash str_hash; + std::hash str_hash; size_t v = str_hash(typeid(t).name()); v = hashing::combine_hashes(v, decl_hash(t)); @@ -168,7 +169,7 @@ struct type_decl::hash size_t scope_decl::hash::operator()(const scope_decl& d) const { - abg_compat::hash hash_string; + std::hash hash_string; size_t v = hash_string(typeid(d).name()); for (scope_decl::declarations::const_iterator i = d.get_member_decls().begin(); @@ -195,7 +196,7 @@ struct scope_type_decl::hash { decl_base::hash decl_hash; type_base::hash type_hash; - abg_compat::hash str_hash; + std::hash str_hash; size_t v = str_hash(typeid(t).name()); v = hashing::combine_hashes(v, decl_hash(t)); @@ -212,7 +213,7 @@ struct qualified_type_def::hash { type_base::hash type_hash; decl_base::hash decl_hash; - abg_compat::hash str_hash; + std::hash str_hash; size_t v = str_hash(typeid(t).name()); v = hashing::combine_hashes(v, type_hash(t)); @@ -227,7 +228,7 @@ struct pointer_type_def::hash size_t operator()(const pointer_type_def& t) const { - abg_compat::hash str_hash; + std::hash str_hash; type_base::hash type_base_hash; decl_base::hash decl_hash; type_base::shared_ptr_hash hash_type_ptr; @@ -245,7 +246,7 @@ struct reference_type_def::hash size_t operator()(const reference_type_def& t) { - abg_compat::hash hash_str; + std::hash hash_str; type_base::hash hash_type_base; decl_base::hash hash_decl; type_base::shared_ptr_hash hash_type_ptr; @@ -266,7 +267,7 @@ struct array_type_def::subrange_type::hash size_t operator()(const array_type_def::subrange_type& s) const { - abg_compat::hash hash_size_t; + std::hash hash_size_t; size_t v = hash_size_t(hash_size_t(s.get_lower_bound())); v = hashing::combine_hashes(v, hash_size_t(s.get_upper_bound())); return v; @@ -278,7 +279,7 @@ struct array_type_def::hash size_t operator()(const array_type_def& t) { - abg_compat::hash hash_str; + std::hash hash_str; type_base::hash hash_type_base; decl_base::hash hash_decl; type_base::shared_ptr_hash hash_type_ptr; @@ -305,10 +306,10 @@ struct enum_type_decl::hash size_t operator()(const enum_type_decl& t) const { - abg_compat::hash str_hash; + std::hash str_hash; decl_base::hash decl_hash; type_base::shared_ptr_hash type_ptr_hash; - abg_compat::hash size_t_hash; + std::hash size_t_hash; size_t v = str_hash(typeid(t).name()); v = hashing::combine_hashes(v, decl_hash(t)); @@ -330,7 +331,7 @@ struct typedef_decl::hash size_t operator()(const typedef_decl& t) const { - abg_compat::hash str_hash; + std::hash str_hash; type_base::hash hash_type; decl_base::hash decl_hash; type_base::shared_ptr_hash type_ptr_hash; @@ -356,10 +357,10 @@ struct typedef_decl::hash size_t var_decl::hash::operator()(const var_decl& t) const { - abg_compat::hash hash_string; + std::hash hash_string; decl_base::hash hash_decl; type_base::shared_ptr_hash hash_type_ptr; - abg_compat::hash hash_size_t; + std::hash hash_size_t; size_t v = hash_string(typeid(t).name()); v = hashing::combine_hashes(v, hash_decl(t)); @@ -395,10 +396,10 @@ var_decl::hash::operator()(const var_decl* t) const size_t function_decl::hash::operator()(const function_decl& t) const { - abg_compat::hash hash_int; - abg_compat::hash hash_size_t; - abg_compat::hash hash_bool; - abg_compat::hash hash_string; + std::hash hash_int; + std::hash hash_size_t; + std::hash hash_bool; + std::hash hash_string; decl_base::hash hash_decl_base; type_base::shared_ptr_hash hash_type_ptr; @@ -440,8 +441,8 @@ function_decl::parameter::hash::operator() (const function_decl::parameter& p) const { type_base::shared_ptr_hash hash_type_ptr; - abg_compat::hash hash_bool; - abg_compat::hash hash_unsigned; + std::hash hash_bool; + std::hash hash_unsigned; size_t v = hash_type_ptr(p.get_type()); v = hashing::combine_hashes(v, hash_unsigned(p.get_index())); v = hashing::combine_hashes(v, hash_bool(p.get_variadic_marker())); @@ -464,7 +465,7 @@ struct method_type::hash size_t operator()(const method_type& t) const { - abg_compat::hash hash_string; + std::hash hash_string; type_base::shared_ptr_hash hash_type_ptr; function_decl::parameter::hash hash_parameter; @@ -500,7 +501,7 @@ struct method_type::hash size_t function_type::hash::operator()(const function_type& t) const { - abg_compat::hash hash_string; + std::hash hash_string; type_base::shared_ptr_hash hash_type_ptr; function_decl::parameter::hash hash_parameter; @@ -544,7 +545,7 @@ function_type::hash::operator()(const function_type_sptr t) const size_t member_base::hash::operator()(const member_base& m) const { - abg_compat::hash hash_int; + std::hash hash_int; return hash_int(m.get_access_specifier()); } @@ -553,9 +554,9 @@ class_decl::base_spec::hash::operator()(const base_spec& t) const { member_base::hash hash_member; type_base::shared_ptr_hash hash_type_ptr; - abg_compat::hash hash_size; - abg_compat::hash hash_bool; - abg_compat::hash hash_string; + std::hash hash_size; + std::hash hash_bool; + std::hash hash_string; size_t v = hash_string(typeid(t).name()); v = hashing::combine_hashes(v, hash_member(t)); @@ -569,10 +570,10 @@ size_t member_function_template::hash::operator() (const member_function_template& t) const { - abg_compat::hash hash_bool; + std::hash hash_bool; function_tdecl::hash hash_function_tdecl; member_base::hash hash_member; - abg_compat::hash hash_string; + std::hash hash_string; size_t v = hash_member(t); string n = t.get_qualified_name(); @@ -589,7 +590,7 @@ member_class_template::hash::operator() { member_base::hash hash_member; class_tdecl::hash hash_class_tdecl; - abg_compat::hash hash_string; + std::hash hash_string; size_t v = hash_member(t); string n = t.get_qualified_name(); @@ -627,7 +628,7 @@ class_or_union::hash::operator()(const class_or_union& t) const ABG_ASSERT(!t.get_is_declaration_only()); - abg_compat::hash hash_string; + std::hash hash_string; scope_type_decl::hash hash_scope_type; var_decl::hash hash_data_member; member_function_template::hash hash_member_fn_tmpl; @@ -706,7 +707,7 @@ class_decl::hash::operator()(const class_decl& t) const ABG_ASSERT(!t.get_is_declaration_only()); - abg_compat::hash hash_string; + std::hash hash_string; class_decl::base_spec::hash hash_base; class_or_union::hash hash_class_or_union; @@ -755,8 +756,8 @@ struct template_parameter::hash t.set_hashing_has_started(true); - abg_compat::hash hash_unsigned; - abg_compat::hash hash_string; + std::hash hash_unsigned; + std::hash hash_string; template_decl::hash hash_template_decl; size_t v = hash_string(typeid(t).name()); @@ -786,7 +787,7 @@ struct template_parameter::shared_ptr_hash size_t template_decl::hash::operator()(const template_decl& t) const { - abg_compat::hash hash_string; + std::hash hash_string; template_parameter::shared_ptr_hash hash_template_parameter; size_t v = hash_string(typeid(t).name()); @@ -807,7 +808,7 @@ struct type_tparameter::hash size_t operator()(const type_tparameter& t) const { - abg_compat::hash hash_string; + std::hash hash_string; template_parameter::hash hash_template_parameter; type_decl::hash hash_type; @@ -828,7 +829,7 @@ size_t non_type_tparameter::hash::operator()(const non_type_tparameter& t) const { template_parameter::hash hash_template_parameter; - abg_compat::hash hash_string; + std::hash hash_string; type_base::shared_ptr_hash hash_type; size_t v = hash_string(typeid(t).name()); @@ -853,7 +854,7 @@ struct template_tparameter::hash size_t operator()(const template_tparameter& t) const { - abg_compat::hash hash_string; + std::hash hash_string; type_tparameter::hash hash_template_type_parm; template_decl::hash hash_template_decl; @@ -891,7 +892,7 @@ operator()(const template_parameter* t) const size_t type_composition::hash::operator()(const type_composition& t) const { - abg_compat::hash hash_string; + std::hash hash_string; type_base::dynamic_hash hash_type; size_t v = hash_string(typeid(t).name()); @@ -912,7 +913,7 @@ size_t function_tdecl::hash:: operator()(const function_tdecl& t) const { - abg_compat::hash hash_string; + std::hash hash_string; decl_base::hash hash_decl_base; template_decl::hash hash_template_decl; function_decl::hash hash_function_decl; @@ -941,7 +942,7 @@ size_t class_tdecl::hash:: operator()(const class_tdecl& t) const { - abg_compat::hash hash_string; + std::hash hash_string; decl_base::hash hash_decl_base; template_decl::hash hash_template_decl; class_decl::hash hash_class_decl; diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 7b060a005bd4..aa91dd3eb3b6 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -10,12 +10,13 @@ /// Definitions for the Internal Representation artifacts of libabigail. #include -#include -#include #include +#include #include -#include #include +#include +#include +#include #include "abg-cxx-compat.h" #include "abg-internal.h" @@ -23276,7 +23277,7 @@ hash_type_or_decl(const type_or_decl_base *tod) ABG_ASSERT(v->get_type()); size_t h = hash_type_or_decl(v->get_type()); string repr = v->get_pretty_representation(); - abg_compat::hash hash_string; + std::hash hash_string; h = hashing::combine_hashes(h, hash_string(repr)); result = h; } @@ -23285,7 +23286,7 @@ hash_type_or_decl(const type_or_decl_base *tod) ABG_ASSERT(f->get_type()); size_t h = hash_type_or_decl(f->get_type()); string repr = f->get_pretty_representation(); - abg_compat::hash hash_string; + std::hash hash_string; h = hashing::combine_hashes(h, hash_string(repr)); result = h; } @@ -23293,8 +23294,8 @@ hash_type_or_decl(const type_or_decl_base *tod) { type_base_sptr parm_type = p->get_type(); ABG_ASSERT(parm_type); - abg_compat::hash hash_bool; - abg_compat::hash hash_unsigned; + std::hash hash_bool; + std::hash hash_unsigned; size_t h = hash_type_or_decl(parm_type); h = hashing::combine_hashes(h, hash_unsigned(p->get_index())); h = hashing::combine_hashes(h, hash_bool(p->get_variadic_marker())); @@ -23303,8 +23304,8 @@ hash_type_or_decl(const type_or_decl_base *tod) else if (class_decl::base_spec *bs = is_class_base_spec(d)) { member_base::hash hash_member; - abg_compat::hash hash_size; - abg_compat::hash hash_bool; + std::hash hash_size; + std::hash hash_bool; type_base_sptr type = bs->get_base_class(); size_t h = hash_type_or_decl(type); h = hashing::combine_hashes(h, hash_member(*bs)); From patchwork Mon Dec 14 23:08:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 41384 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9DDC7385800E; Mon, 14 Dec 2020 23:09:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9DDC7385800E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607987360; bh=yz/ueteEGC/xxX4tWTTfuSZDIDCqRc1Q1fCbGZvOfdY=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=k89qsd7fepvMUYAWNwqA3gfHjkozmualzdqPtv1nNg77WWUHrhMsI6t+MkoXqccAk N9pKCVVdISwH/jl1t6whr02Q7y9WzuzJH3GLkyYuDtjdA9C7YOMgXLVVbo6G7X8Tr5 ZdsVAox6g3zan94Qh+M183Ldmpr2PMSN6np4LpA8= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wr1-x44a.google.com (mail-wr1-x44a.google.com [IPv6:2a00:1450:4864:20::44a]) by sourceware.org (Postfix) with ESMTPS id 4E6B43858D29 for ; Mon, 14 Dec 2020 23:09:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4E6B43858D29 Received: by mail-wr1-x44a.google.com with SMTP id g17so2784403wrr.11 for ; Mon, 14 Dec 2020 15:09:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=yz/ueteEGC/xxX4tWTTfuSZDIDCqRc1Q1fCbGZvOfdY=; b=qevw0QgvOBFfq9NpmRNVYa4gZg/1LzYX3EE6amh5L1VMH9AnL4dy3U/Be1Si3lXpNZ xGghS0nIZXbKld63qyWtM+lATorDug21WykZmbhQd2X6wT7wjanQGD9oOxMuLK4Yt6r1 T9/wAN5QYX9ya/FTpMmC46tnPbKSKjaAnsh4H1iPNKUYKd2ZqHflbVg+J02BiiiwkI4X 3nU6Ykr5j8enC1cGeVvO771Lb9o3maFxsbH3UIagopn3bC0uLxDfUq+ZpLmpEuqrWqBA Q2pRnbJ3DvMktIg2uCB2tc6hPxhvBQvW9DLHnT4nZHS6HNZxJSJHoC89TJY0ACYpw2fz 5W0Q== X-Gm-Message-State: AOAM531mAl5LVM+yjV+aAuDvxvq4uwLUNN4RaJdLSKjBonreAeDXBpEp oamP5b3L+LFwUQTCOzQkw/5zWJ1j1DOxUCKJxy1qXO5ABFHbm8UMqisqeLWlcXi9WeHb+nyVVIm iq/jsK7agSTkIq1PgqRi8crDsxqHQpY3tG258mJDP81r1x1ME+TNXkYrB71m7k9bZ1efFiko= X-Google-Smtp-Source: ABdhPJykS2NjYRlI5CFY8MKeLWU1B2hGCsGplQ1mNWFKEzu9Fe1+11ipJZCFw2cjdgWSQ9CZrznbmVbwqR74sw== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a5d:5049:: with SMTP id h9mr23283644wrt.404.1607987355254; Mon, 14 Dec 2020 15:09:15 -0800 (PST) Date: Mon, 14 Dec 2020 23:08:53 +0000 In-Reply-To: <20201214230855.1574934-1-maennich@google.com> Message-Id: <20201214230855.1574934-4-maennich@google.com> Mime-Version: 1.0 References: <20201214230855.1574934-1-maennich@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH 3/6] Remove usages from abg_compat To: libabigail@sourceware.org X-Spam-Status: No, score=-22.7 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" std::shared_ptr, std::weak_ptr, std::dynamic_pointer_cast, std::static_pointer_cast are now provided through the language standard, hence remove the compatibility code for and adjust all users accordingly. * include/abg-cxx-compat.h: Drop compatibility layer for . * include/abg-diff-utils.h: migrate abg_compat use to std. * include/abg-fwd.h: Likewise. * include/abg-ini.h: Likewise. * include/abg-interned-str.h: Likewise. * include/abg-libxml-utils.h: Likewise. * include/abg-libzip-utils.h: Likewise. * include/abg-regex.h: Likewise. * include/abg-reporter.h: Likewise. * include/abg-sptr-utils.h: Likewise. * include/abg-tools-utils.h: Likewise. * include/abg-workers.h: Likewise. * src/abg-comp-filter.cc: Likewise. * src/abg-comparison-priv.h: Likewise. * src/abg-dwarf-reader.cc: Likewise. * src/abg-ir.cc: Likewise. * src/abg-reader.cc: Likewise. * src/abg-suppression.cc: Likewise. * src/abg-tools-utils.cc: Likewise. * src/abg-writer.cc: Likewise. * tests/test-diff-filter.cc: Likewise. * tests/test-diff-pkg.cc: Likewise. * tests/test-diff-suppr.cc: Likewise. * tests/test-read-dwarf.cc: Likewise. * tests/test-read-write.cc: Likewise. * tests/test-types-stability.cc: Likewise. * tests/test-write-read-archive.cc: Likewise. * tools/abicompat.cc: Likewise. * tools/abidiff.cc: Likewise. * tools/abidw.cc: Likewise. * tools/abilint.cc: Likewise. * tools/abipkgdiff.cc: Likewise. Signed-off-by: Matthias Maennich --- include/abg-cxx-compat.h | 7 ------- include/abg-diff-utils.h | 7 ++++--- include/abg-fwd.h | 11 ++++++----- include/abg-ini.h | 9 +++++---- include/abg-interned-str.h | 3 ++- include/abg-libxml-utils.h | 3 ++- include/abg-libzip-utils.h | 3 ++- include/abg-regex.h | 3 ++- include/abg-reporter.h | 3 ++- include/abg-sptr-utils.h | 3 ++- include/abg-tools-utils.h | 13 +++++++------ include/abg-workers.h | 3 ++- src/abg-comp-filter.cc | 3 ++- src/abg-comparison-priv.h | 5 +++-- src/abg-dwarf-reader.cc | 11 ++++++----- src/abg-ir.cc | 5 +++-- src/abg-reader.cc | 15 ++++++++------- src/abg-suppression.cc | 3 ++- src/abg-tools-utils.cc | 14 +++++++------- src/abg-writer.cc | 13 +++++++------ tests/test-diff-filter.cc | 7 ++++--- tests/test-diff-pkg.cc | 7 ++++--- tests/test-diff-suppr.cc | 11 ++++++----- tests/test-read-dwarf.cc | 7 ++++--- tests/test-read-write.cc | 9 +++++---- tests/test-types-stability.cc | 7 ++++--- tests/test-write-read-archive.cc | 5 +++-- tools/abicompat.cc | 9 +++++---- tools/abidiff.cc | 7 ++++--- tools/abidw.cc | 9 +++++---- tools/abilint.cc | 9 +++++---- tools/abipkgdiff.cc | 15 ++++++++------- 32 files changed, 131 insertions(+), 108 deletions(-) diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h index f3c343dfd481..2d3b2b036a37 100644 --- a/include/abg-cxx-compat.h +++ b/include/abg-cxx-compat.h @@ -8,18 +8,11 @@ #ifndef __ABG_CXX_COMPAT_H #define __ABG_CXX_COMPAT_H -#include #include #include namespace abg_compat { -// -using std::shared_ptr; -using std::weak_ptr; -using std::dynamic_pointer_cast; -using std::static_pointer_cast; - // using std::unordered_map; diff --git a/include/abg-diff-utils.h b/include/abg-diff-utils.h index 06e953c41913..89eee495282d 100644 --- a/include/abg-diff-utils.h +++ b/include/abg-diff-utils.h @@ -21,13 +21,14 @@ #ifndef __ABG_DIFF_UTILS_H__ #define __ABG_DIFF_UTILS_H__ -#include #include #include +#include #include +#include +#include #include #include -#include #include "abg-cxx-compat.h" #include "abg-fwd.h" @@ -42,7 +43,7 @@ namespace abigail namespace diff_utils { -using abg_compat::shared_ptr; +using std::shared_ptr; // Inject the names from std:: below into this namespace using std::string; diff --git a/include/abg-fwd.h b/include/abg-fwd.h index a8d99acbcee6..0eba77175636 100644 --- a/include/abg-fwd.h +++ b/include/abg-fwd.h @@ -9,14 +9,15 @@ #define __ABG_IRFWD_H__ #include -#include #include +#include #include -#include +#include +#include #include #include #include // for std::rel_ops, at least. -#include +#include #include "abg-cxx-compat.h" #include "abg-interned-str.h" #include "abg-hash.h" @@ -48,8 +49,8 @@ namespace abigail */ // Inject some types. -using abg_compat::shared_ptr; -using abg_compat::weak_ptr; +using std::shared_ptr; +using std::weak_ptr; using abg_compat::unordered_map; using std::string; using std::vector; diff --git a/include/abg-ini.h b/include/abg-ini.h index f96c85860370..665cdcd3d664 100644 --- a/include/abg-ini.h +++ b/include/abg-ini.h @@ -13,10 +13,11 @@ #ifndef __ABG_INI_H__ #define __ABG_INI_H__ -#include -#include #include +#include #include +#include +#include #include "abg-cxx-compat.h" namespace abigail @@ -25,8 +26,8 @@ namespace abigail namespace ini { // Inject some standard types in this namespace. -using abg_compat::shared_ptr; -using abg_compat::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using std::string; using std::vector; using std:: pair; diff --git a/include/abg-interned-str.h b/include/abg-interned-str.h index dc1adf1fb290..ed6499090c43 100644 --- a/include/abg-interned-str.h +++ b/include/abg-interned-str.h @@ -17,6 +17,7 @@ #define __ABG_INTERNED_STR_H__ #include +#include #include #include #include "abg-cxx-compat.h" @@ -26,7 +27,7 @@ namespace abigail { // Inject some std types into this namespace. using abg_compat::unordered_set; -using abg_compat::shared_ptr; +using std::shared_ptr; using std::string; using std::ostream; diff --git a/include/abg-libxml-utils.h b/include/abg-libxml-utils.h index a8afff9f1705..081bd8f2e908 100644 --- a/include/abg-libxml-utils.h +++ b/include/abg-libxml-utils.h @@ -11,6 +11,7 @@ #include #include +#include #include "abg-sptr-utils.h" #include "abg-cxx-compat.h" @@ -23,7 +24,7 @@ namespace xml { using sptr_utils::build_sptr; -using abg_compat::shared_ptr; +using std::shared_ptr; /// A convenience typedef for a shared pointer of xmlTextReader. typedef shared_ptr reader_sptr; diff --git a/include/abg-libzip-utils.h b/include/abg-libzip-utils.h index 998b36b8c54c..82378fa18f25 100644 --- a/include/abg-libzip-utils.h +++ b/include/abg-libzip-utils.h @@ -9,6 +9,7 @@ #define __ABG_LIBZIP_UTILS_H__ #include +#include #include "abg-cxx-compat.h" namespace abigail @@ -17,7 +18,7 @@ namespace abigail namespace zip_utils { -using abg_compat::shared_ptr; +using std::shared_ptr; using std::string; /// @brief Functor passed to shared_ptr constructor during diff --git a/include/abg-regex.h b/include/abg-regex.h index c0b8e330707a..477ebbb94a3d 100644 --- a/include/abg-regex.h +++ b/include/abg-regex.h @@ -12,6 +12,7 @@ #include +#include #include #include @@ -26,7 +27,7 @@ namespace regex { /// A convenience typedef for a shared pointer of regex_t. -typedef abg_compat::shared_ptr regex_t_sptr; +typedef std::shared_ptr regex_t_sptr; /// A delete functor for a shared_ptr of regex_t. struct regex_t_deleter diff --git a/include/abg-reporter.h b/include/abg-reporter.h index 006020cff4e7..22d4d4258322 100644 --- a/include/abg-reporter.h +++ b/include/abg-reporter.h @@ -13,6 +13,7 @@ #ifndef __ABG_REPORTER_H__ #define __ABG_REPORTER_H__ +#include #include #include #include "abg-cxx-compat.h" @@ -20,7 +21,7 @@ namespace abigail { -using abg_compat::shared_ptr; +using std::shared_ptr; namespace comparison { diff --git a/include/abg-sptr-utils.h b/include/abg-sptr-utils.h index 3f328522a153..65def7d2f4f7 100644 --- a/include/abg-sptr-utils.h +++ b/include/abg-sptr-utils.h @@ -11,6 +11,7 @@ #define __ABG_SPTR_UTILS_H__ #include +#include #include "abg-cxx-compat.h" @@ -21,7 +22,7 @@ namespace abigail namespace sptr_utils { -using abg_compat::shared_ptr; +using std::shared_ptr; /// This is to be specialized for the diverse C types that needs /// wrapping in shared_ptr. diff --git a/include/abg-tools-utils.h b/include/abg-tools-utils.h index 1bab78e6d8af..14781a456301 100644 --- a/include/abg-tools-utils.h +++ b/include/abg-tools-utils.h @@ -8,11 +8,12 @@ #ifndef __ABG_TOOLS_UTILS_H #define __ABG_TOOLS_UTILS_H -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include "abg-cxx-compat.h" #include "abg-suppression.h" @@ -27,7 +28,7 @@ using std::istream; using std::ifstream; using std::string; using std::set; -using abg_compat::shared_ptr; +using std::shared_ptr; const char* get_system_libdir(); const char* get_anonymous_struct_internal_name_prefix(); @@ -303,7 +304,7 @@ bool file_is_kernel_debuginfo_package(const string& file_path, file_type file_type); -abg_compat::shared_ptr +std::shared_ptr make_path_absolute(const char*p); char* diff --git a/include/abg-workers.h b/include/abg-workers.h index f923a751ec6d..4cbff8308e42 100644 --- a/include/abg-workers.h +++ b/include/abg-workers.h @@ -16,10 +16,11 @@ #ifndef __ABG_WORKERS_H__ #define __ABG_WORKERS_H__ +#include #include #include "abg-cxx-compat.h" -using abg_compat::shared_ptr; +using std::shared_ptr; namespace abigail { diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc index 7d44419f7e89..a3320091c309 100644 --- a/src/abg-comp-filter.cc +++ b/src/abg-comp-filter.cc @@ -12,6 +12,7 @@ #include "abg-cxx-compat.h" #include "abg-internal.h" +#include // ABG_BEGIN_EXPORT_DECLARATIONS @@ -28,7 +29,7 @@ namespace comparison namespace filtering { -using abg_compat::dynamic_pointer_cast; +using std::dynamic_pointer_cast; /// Walk the diff sub-trees of a a @ref corpus_diff and apply a filter /// to the nodes visted. The filter categorizes each node, assigning diff --git a/src/abg-comparison-priv.h b/src/abg-comparison-priv.h index ef98d0a1f53e..1f04f3cbb61a 100644 --- a/src/abg-comparison-priv.h +++ b/src/abg-comparison-priv.h @@ -19,6 +19,7 @@ #include "abg-cxx-compat.h" #include "abg-internal.h" // +#include ABG_BEGIN_EXPORT_DECLARATIONS #include "abg-hash.h" @@ -42,8 +43,8 @@ using namespace abigail::suppr; // Inject types from outside in here. using std::vector; -using abg_compat::dynamic_pointer_cast; -using abg_compat::static_pointer_cast; +using std::dynamic_pointer_cast; +using std::static_pointer_cast; using abigail::sptr_utils::noop_deleter; /// Convenience typedef for a pair of decls or types. diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 5cd839e577d3..e8f43bc6ab57 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -19,16 +19,17 @@ #include #include #include -#include -#include #include #include #include -#include +#include +#include #include #include +#include #include #include +#include #include "abg-cxx-compat.h" #include "abg-ir-priv.h" @@ -62,8 +63,8 @@ using std::cerr; namespace dwarf_reader { -using abg_compat::dynamic_pointer_cast; -using abg_compat::static_pointer_cast; +using std::dynamic_pointer_cast; +using std::static_pointer_cast; using abg_compat::unordered_map; using abg_compat::unordered_set; using std::stack; diff --git a/src/abg-ir.cc b/src/abg-ir.cc index aa91dd3eb3b6..4fbbc6a3a211 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -117,8 +118,8 @@ using std::string; using std::list; using std::vector; using abg_compat::unordered_map; -using abg_compat::dynamic_pointer_cast; -using abg_compat::static_pointer_cast; +using std::dynamic_pointer_cast; +using std::static_pointer_cast; /// Convenience typedef for a map of string -> string*. typedef unordered_map pool_map_type; diff --git a/src/abg-reader.cc b/src/abg-reader.cc index 32808bc1bca0..c89e3ccd29d6 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -11,14 +11,15 @@ /// native XML format is named "abixml". #include "config.h" -#include -#include +#include +#include +#include #include +#include +#include #include -#include +#include #include -#include -#include #include "abg-cxx-compat.h" #include "abg-suppression-priv.h" @@ -50,9 +51,9 @@ namespace xml_reader { using std::string; using std::deque; -using abg_compat::shared_ptr; +using std::shared_ptr; using abg_compat::unordered_map; -using abg_compat::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using std::vector; using std::istream; #ifdef WITH_ZIP_ARCHIVE diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc index 2cfa25fce312..4b955da7647b 100644 --- a/src/abg-suppression.cc +++ b/src/abg-suppression.cc @@ -14,6 +14,7 @@ #include "abg-cxx-compat.h" #include "abg-internal.h" +#include // ABG_BEGIN_EXPORT_DECLARATIONS @@ -34,7 +35,7 @@ namespace abigail namespace suppr { -using abg_compat::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using regex::regex_t_sptr; // diff --git a/src/abg-tools-utils.cc b/src/abg-tools-utils.cc index 5bb3c7ca0f17..7df3da5ffbfc 100644 --- a/src/abg-tools-utils.cc +++ b/src/abg-tools-utils.cc @@ -30,19 +30,19 @@ #include #include #include -#include -#include -#include -#include #include #include #include +#include +#include +#include #include #include +#include +#include #include - #include "abg-dwarf-reader.h" #include "abg-internal.h" #include "abg-cxx-compat.h" @@ -1709,10 +1709,10 @@ struct malloced_char_star_deleter /// @param p the path to turn into an absolute path. /// /// @return a shared pointer to the resulting absolute path. -abg_compat::shared_ptr +std::shared_ptr make_path_absolute(const char*p) { - using abg_compat::shared_ptr; + using std::shared_ptr; shared_ptr result; diff --git a/src/abg-writer.cc b/src/abg-writer.cc index aed145cea4c4..494847b8635b 100644 --- a/src/abg-writer.cc +++ b/src/abg-writer.cc @@ -12,13 +12,14 @@ #include "config.h" #include +#include +#include #include #include -#include +#include #include -#include #include -#include +#include #include "abg-cxx-compat.h" #include "abg-tools-utils.h" @@ -46,9 +47,9 @@ ABG_END_EXPORT_DECLARATIONS namespace abigail { using std::cerr; -using abg_compat::shared_ptr; -using abg_compat::dynamic_pointer_cast; -using abg_compat::static_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; +using std::static_pointer_cast; using std::ofstream; using std::ostream; using std::ostringstream; diff --git a/tests/test-diff-filter.cc b/tests/test-diff-filter.cc index 6148cab24cfc..f378fa23e157 100644 --- a/tests/test-diff-filter.cc +++ b/tests/test-diff-filter.cc @@ -18,10 +18,11 @@ #include #include -#include +#include #include #include -#include +#include +#include #include "abg-workers.h" #include "abg-tools-utils.h" #include "test-utils.h" @@ -869,7 +870,7 @@ int main() { using std::vector; - using abg_compat::dynamic_pointer_cast; + using std::dynamic_pointer_cast; using abigail::workers::queue; using abigail::workers::task; using abigail::workers::task_sptr; diff --git a/tests/test-diff-pkg.cc b/tests/test-diff-pkg.cc index 97c1dc9d90c5..0df7005b825a 100644 --- a/tests/test-diff-pkg.cc +++ b/tests/test-diff-pkg.cc @@ -20,10 +20,11 @@ #include "config.h" #include #include -#include -#include #include +#include #include +#include +#include #include #include "abg-workers.h" #include "test-utils.h" @@ -813,7 +814,7 @@ int main() { using std::vector; - using abg_compat::dynamic_pointer_cast; + using std::dynamic_pointer_cast; using abigail::workers::queue; using abigail::workers::task; using abigail::workers::task_sptr; diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc index 32800d46ae22..f6548d066391 100644 --- a/tests/test-diff-suppr.cc +++ b/tests/test-diff-suppr.cc @@ -16,11 +16,12 @@ /// one. #include +#include #include -#include #include #include -#include +#include +#include #include "abg-cxx-compat.h" #include "abg-tools-utils.h" #include "abg-workers.h" @@ -2169,7 +2170,7 @@ main(int argc, char *argv[]) for (InOutSpec* s = in_out_specs; s->in_elfv0_path; ++s) { - abg_compat::shared_ptr t( + std::shared_ptr t( new test_task(*s, in_base_path, out_base_path)); ABG_ASSERT(task_queue.schedule_task(t)); } @@ -2189,8 +2190,8 @@ main(int argc, char *argv[]) ti != completed_tasks.end(); ++ti) { - abg_compat::shared_ptr t = - abg_compat::dynamic_pointer_cast(*ti); + std::shared_ptr t = + std::dynamic_pointer_cast(*ti); if (!t->is_ok) { is_ok = false; diff --git a/tests/test-read-dwarf.cc b/tests/test-read-dwarf.cc index df5368d23e38..1212e11c0663 100644 --- a/tests/test-read-dwarf.cc +++ b/tests/test-read-dwarf.cc @@ -9,11 +9,12 @@ /// files and diff the corpus files against reference XML corpus /// files. -#include +#include #include #include +#include +#include #include -#include #include "abg-ir.h" #include "abg-dwarf-reader.h" #include "abg-workers.h" @@ -25,7 +26,7 @@ using std::vector; using std::string; using std::ofstream; using std::cerr; -using abg_compat::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using abigail::tests::get_build_dir; using abigail::dwarf_reader::read_corpus_from_elf; using abigail::dwarf_reader::read_context; diff --git a/tests/test-read-write.cc b/tests/test-read-write.cc index 188441284fac..1cddc0ea9220 100644 --- a/tests/test-read-write.cc +++ b/tests/test-read-write.cc @@ -7,11 +7,12 @@ /// save it back and diff the resulting XML file against the input /// file. They should be identical. -#include -#include -#include #include #include +#include +#include +#include +#include #include #include "abg-cxx-compat.h" #include "abg-ir.h" @@ -26,7 +27,7 @@ using std::vector; using std::ofstream; using std::cerr; -using abg_compat::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using abigail::tools_utils::file_type; using abigail::tools_utils::check_file; diff --git a/tests/test-types-stability.cc b/tests/test-types-stability.cc index 7dd42312fb0d..22a85e646de9 100644 --- a/tests/test-types-stability.cc +++ b/tests/test-types-stability.cc @@ -21,10 +21,11 @@ /// /// The comparison is expected to yield the empty set. -#include +#include #include #include -#include +#include +#include #include "abg-tools-utils.h" #include "test-utils.h" #include "abg-dwarf-reader.h" @@ -103,7 +104,7 @@ int main() { using std::vector; - using abg_compat::dynamic_pointer_cast; + using std::dynamic_pointer_cast; using abigail::workers::queue; using abigail::workers::task; using abigail::workers::task_sptr; diff --git a/tests/test-write-read-archive.cc b/tests/test-write-read-archive.cc index 0a4492f10b19..dd16586f006e 100644 --- a/tests/test-write-read-archive.cc +++ b/tests/test-write-read-archive.cc @@ -4,8 +4,9 @@ // Copyright (C) 2013-2020 Red Hat, Inc. #include -#include #include +#include +#include #include "test-utils.h" #include "abg-ir.h" #include "abg-corpus.h" @@ -63,7 +64,7 @@ const InOutSpec archive_spec = using std::string; using std::cerr; using std::ofstream; -using abg_compat::shared_ptr; +using std::shared_ptr; using abigail::corpus; using abigail::corpus_sptr; using abigail::translation_unit; diff --git a/tools/abicompat.cc b/tools/abicompat.cc index 87fd2a0b9b72..2007a391932f 100644 --- a/tools/abicompat.cc +++ b/tools/abicompat.cc @@ -27,12 +27,13 @@ #include #include -#include #include #include -#include -#include +#include #include +#include +#include +#include #include "abg-cxx-compat.h" #include "abg-config.h" #include "abg-tools-utils.h" @@ -47,7 +48,7 @@ using std::cout; using std::ostream; using std::ofstream; using std::vector; -using abg_compat::shared_ptr; +using std::shared_ptr; using abigail::tools_utils::emit_prefix; diff --git a/tools/abidiff.cc b/tools/abidiff.cc index ca0b39b28446..666f8d574cde 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -8,9 +8,10 @@ /// @file #include -#include -#include #include +#include +#include +#include #include "abg-config.h" #include "abg-comp-filter.h" #include "abg-suppression.h" @@ -23,7 +24,7 @@ using std::string; using std::ostream; using std::cout; using std::cerr; -using abg_compat::shared_ptr; +using std::shared_ptr; using abigail::ir::environment; using abigail::ir::environment_sptr; using abigail::translation_unit; diff --git a/tools/abidw.cc b/tools/abidw.cc index b1515e7b3f47..9e8251f63cc5 100644 --- a/tools/abidw.cc +++ b/tools/abidw.cc @@ -13,12 +13,13 @@ #include #include -#include #include #include -#include -#include +#include #include +#include +#include +#include #include #include "abg-cxx-compat.h" #include "abg-config.h" @@ -35,7 +36,7 @@ using std::cout; using std::ostream; using std::ofstream; using std::vector; -using abg_compat::shared_ptr; +using std::shared_ptr; using abigail::tools_utils::emit_prefix; using abigail::tools_utils::temp_file; using abigail::tools_utils::temp_file_sptr; diff --git a/tools/abilint.cc b/tools/abilint.cc index 54cbefd11a95..63d0d6b8a1f9 100644 --- a/tools/abilint.cc +++ b/tools/abilint.cc @@ -13,12 +13,13 @@ /// runs a diff on the two files and expects the result of the diff to /// be empty. -#include #include #include -#include -#include +#include #include +#include +#include +#include #include #include "abg-cxx-compat.h" #include "abg-config.h" @@ -68,7 +69,7 @@ struct options bool read_tu; bool diff; bool noout; - abg_compat::shared_ptr di_root_path; + std::shared_ptr di_root_path; vector suppression_paths; string headers_dir; vector header_files; diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc index 05af746d9e7f..6c2c6a53bad3 100644 --- a/tools/abipkgdiff.cc +++ b/tools/abipkgdiff.cc @@ -71,14 +71,15 @@ #include #endif -#include +#include +#include +#include #include +#include +#include +#include #include -#include -#include #include -#include -#include #include "abg-cxx-compat.h" #include "abg-workers.h" @@ -100,8 +101,8 @@ using std::map; using abg_compat::unordered_set; using std::set; using std::ostringstream; -using abg_compat::shared_ptr; -using abg_compat::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using abigail::workers::task; using abigail::workers::task_sptr; using abigail::workers::queue; From patchwork Mon Dec 14 23:08:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 41385 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E37FE3857C56; Mon, 14 Dec 2020 23:09:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E37FE3857C56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607987360; bh=Oa8YQw+LxZOhwkkOFXfQy5Fo5wT/L7iVfx8+5cvwPqM=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=GOPbENfA5byYiLnaMKn6nfwqiN/gpNAD4qqHM5HNLHeuoU3i+TJ0Rv/98RO6yMBRq GPIwGj0nEUmzA3m5pNaOJUdCcmK9CjAp1ak/47WuAUb5rVTIeJLmN7RR801gowpjLZ TDfgblaDid4QQ6oEfiKif9Mbvfyy+QAaGKLs9VWE= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wr1-x449.google.com (mail-wr1-x449.google.com [IPv6:2a00:1450:4864:20::449]) by sourceware.org (Postfix) with ESMTPS id 676003857C55 for ; Mon, 14 Dec 2020 23:09:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 676003857C55 Received: by mail-wr1-x449.google.com with SMTP id 88so655432wrc.17 for ; Mon, 14 Dec 2020 15:09:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Oa8YQw+LxZOhwkkOFXfQy5Fo5wT/L7iVfx8+5cvwPqM=; b=fRzDluBp3Fnucl2tnUe9dxq+2bAfw4araO5mvKEThz5NFIphlqjBZVageuhIjzwM5w JAlBDjvgTBmE2B55QjSxMmkjFvbVQxYhgvBeknSCH/grkSi0sjVvI8c4LIKgfhm8yutH 6m/aCaaRz0kloo88nLuQHEjcX5Uvag87yn/9ONttP0ZTjnSqVRVuvq6Wn8SvZwYSndMZ vZMpjqvk42WFPDHjjBP1Z4PvtHKwpSQqed50hUjycQLQKJRMQ2bg0SGLh7YJcsheHBtx BzKfCvdVrdY3DfbhbEMV2HXIZT/es2hXiYNa+JFyFijvmnsIQCTUC/qihtDPL7wFskAi ph4A== X-Gm-Message-State: AOAM5328l1GqDoW4ff27Z/UtCFww2OFO7NtkMrbW0WZZjhzHfYjWd/ED 6qvgRTBTyGlVgrdHt85GUPT28//nvBoxKdM6cj8Kx6X/SDKYVNqhLgYHLQuU5OeGoS1+iOulQd8 mTuz3T0oVUQ7+Zp3P+AYohm+faXxJJyekQ8grtDkB8NCXNo+bYoqYUhkG5Zgv5PrNAW6M264= X-Google-Smtp-Source: ABdhPJwcRLOgz+OqrzkarMJlFvxHlgctJ4hdWPIy74pB/XZwJzsiGIWVFfralBFB4bjjO485Qj0AQyIC4Mjmew== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a1c:4184:: with SMTP id o126mr29595022wma.107.1607987357365; Mon, 14 Dec 2020 15:09:17 -0800 (PST) Date: Mon, 14 Dec 2020 23:08:54 +0000 In-Reply-To: <20201214230855.1574934-1-maennich@google.com> Message-Id: <20201214230855.1574934-5-maennich@google.com> Mime-Version: 1.0 References: <20201214230855.1574934-1-maennich@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH 4/6] Remove usages from abg_compat To: libabigail@sourceware.org X-Spam-Status: No, score=-23.4 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" std::unordered_map is now provided through the language standard, hence remove the compatibility code for and adjust all users accordingly. * include/abg-cxx-compat.h: Drop compatibility layer for . * include/abg-comparison.h: migrate abg_compat use to std. * include/abg-cxx-compat.h: Likewise. * include/abg-fwd.h: Likewise. * include/abg-ir.h: Likewise. * src/abg-corpus.cc: Likewise. * src/abg-dwarf-reader.cc: Likewise. * src/abg-ir.cc: Likewise. * src/abg-reader.cc: Likewise. * src/abg-writer.cc: Likewise. Signed-off-by: Matthias Maennich --- include/abg-comparison.h | 3 ++- include/abg-cxx-compat.h | 4 ---- include/abg-fwd.h | 3 ++- include/abg-ir.h | 9 +++++---- src/abg-corpus.cc | 3 ++- src/abg-dwarf-reader.cc | 3 ++- src/abg-ir.cc | 3 ++- src/abg-reader.cc | 5 +++-- src/abg-writer.cc | 3 ++- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/include/abg-comparison.h b/include/abg-comparison.h index f3d33e9a28af..c9e8df7624d2 100644 --- a/include/abg-comparison.h +++ b/include/abg-comparison.h @@ -11,6 +11,7 @@ /// @file #include +#include #include "abg-cxx-compat.h" #include "abg-corpus.h" #include "abg-diff-utils.h" @@ -36,7 +37,7 @@ typedef std::vector filters; // Inject types we need into this namespace. using std::ostream; using std::vector; -using abg_compat::unordered_map; +using std::unordered_map; using abg_compat::unordered_set; using std::pair; diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h index 2d3b2b036a37..fd693933d65f 100644 --- a/include/abg-cxx-compat.h +++ b/include/abg-cxx-compat.h @@ -8,14 +8,10 @@ #ifndef __ABG_CXX_COMPAT_H #define __ABG_CXX_COMPAT_H -#include #include namespace abg_compat { -// -using std::unordered_map; - // using std::unordered_set; diff --git a/include/abg-fwd.h b/include/abg-fwd.h index 0eba77175636..4d594afaccf6 100644 --- a/include/abg-fwd.h +++ b/include/abg-fwd.h @@ -16,6 +16,7 @@ #include #include #include +#include #include // for std::rel_ops, at least. #include #include "abg-cxx-compat.h" @@ -51,7 +52,7 @@ namespace abigail // Inject some types. using std::shared_ptr; using std::weak_ptr; -using abg_compat::unordered_map; +using std::unordered_map; using std::string; using std::vector; diff --git a/include/abg-ir.h b/include/abg-ir.h index 561d20960ed4..06e03b5f14c9 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "abg-cxx-compat.h" #include "abg-fwd.h" #include "abg-hash.h" @@ -92,7 +93,7 @@ namespace ir { // Inject some std types in here. -using abg_compat::unordered_map; +using std::unordered_map; /// A convenience typedef fo r an ordered set of size_t. typedef unordered_set pointer_set; @@ -138,7 +139,7 @@ public: /// the pretty representation string of a particular type and the /// value is the vector of canonical types that have the same pretty /// representation string. - typedef abg_compat::unordered_map > + typedef std::unordered_map > canonical_types_map_type; private: @@ -758,7 +759,7 @@ typedef weak_ptr elf_symbol_wptr; /// Convenience typedef for a map which key is a string and which /// value if the elf symbol of the same name. -typedef abg_compat::unordered_map +typedef std::unordered_map string_elf_symbol_sptr_map_type; /// Convenience typedef for a shared pointer to an @@ -771,7 +772,7 @@ typedef std::vector elf_symbols; /// Convenience typedef for a map which key is a string and which /// value is a vector of elf_symbol. -typedef abg_compat::unordered_map +typedef std::unordered_map string_elf_symbols_map_type; /// Convenience typedef for a shared pointer to diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc index 6924944cb618..e2319d186259 100644 --- a/src/abg-corpus.cc +++ b/src/abg-corpus.cc @@ -12,6 +12,7 @@ #include #include #include +#include #include "abg-cxx-compat.h" #include "abg-internal.h" @@ -43,7 +44,7 @@ namespace ir { using std::ostringstream; -using abg_compat::unordered_map; +using std::unordered_map; using std::list; using std::vector; diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index e8f43bc6ab57..c3723ae15236 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -30,6 +30,7 @@ #include #include #include +#include #include "abg-cxx-compat.h" #include "abg-ir-priv.h" @@ -65,7 +66,7 @@ namespace dwarf_reader using std::dynamic_pointer_cast; using std::static_pointer_cast; -using abg_compat::unordered_map; +using std::unordered_map; using abg_compat::unordered_set; using std::stack; using std::deque; diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 4fbbc6a3a211..5f931ee79509 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -117,7 +118,7 @@ namespace abigail using std::string; using std::list; using std::vector; -using abg_compat::unordered_map; +using std::unordered_map; using std::dynamic_pointer_cast; using std::static_pointer_cast; diff --git a/src/abg-reader.cc b/src/abg-reader.cc index c89e3ccd29d6..fb7326ed1b81 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include "abg-cxx-compat.h" #include "abg-suppression-priv.h" @@ -52,7 +53,7 @@ namespace xml_reader using std::string; using std::deque; using std::shared_ptr; -using abg_compat::unordered_map; +using std::unordered_map; using std::dynamic_pointer_cast; using std::vector; using std::istream; @@ -2886,7 +2887,7 @@ build_elf_symbol_db(read_context& ctxt, ctxt.set_corpus_node(node); - typedef abg_compat::unordered_map + typedef std::unordered_map xml_node_ptr_elf_symbol_sptr_map_type; xml_node_ptr_elf_symbol_sptr_map_type xml_node_ptr_elf_symbol_map; diff --git a/src/abg-writer.cc b/src/abg-writer.cc index 494847b8635b..0953c8b3c7ee 100644 --- a/src/abg-writer.cc +++ b/src/abg-writer.cc @@ -19,6 +19,7 @@ #include #include #include +#include #include #include "abg-cxx-compat.h" @@ -56,7 +57,7 @@ using std::ostringstream; using std::list; using std::vector; using std::stack; -using abg_compat::unordered_map; +using std::unordered_map; using abigail::sptr_utils::noop_deleter; #if WITH_ZIP_ARCHIVE From patchwork Mon Dec 14 23:08:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 41386 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 62A39385800E; Mon, 14 Dec 2020 23:09:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 62A39385800E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607987363; bh=IKwUHf+Oy+EGEg/HtJodkQffU87a1dnUHVS2D0b2Uh8=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=jpHKbyjOyH96NopYNDyPQNzzLrtivTf5swjk1HR0i6QzYKXEwrbfl/GHIAuRkTFxd p1hQjEZRnV+jeAxDG0Ir21xqkYstinvTfZExkOm1VfB1/Qi248+55giSLSkDQPIcXs xvu9BPxkYOFREHlOJ0v0/5SOkCEhbROvDozNxkzo= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by sourceware.org (Postfix) with ESMTPS id 197183858D29 for ; Mon, 14 Dec 2020 23:09:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 197183858D29 Received: by mail-qt1-x849.google.com with SMTP id 99so12881594qte.19 for ; Mon, 14 Dec 2020 15:09:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=IKwUHf+Oy+EGEg/HtJodkQffU87a1dnUHVS2D0b2Uh8=; b=hAbMFiGAL1+IEzbrJ9CKief5oACf5rYjMRbzEFfglHvVCTkGpQorFU8azhrqN4pnnh ERaxcq4pv9Hkqftx0QNfR66a2R0odZD/SQfvjVLVRbOD+3LQKoo8ZWtwDubak0nsNwYU Rzk8JSzUi3x+d9RLMQybm2/pf5UxK4pXbmBeb/zkl/OoJ1Km5GjaaGrBHR1eTK1Kbr7C iq7XfDaJtDTwCJto6Qcfx7yrSNJ5QDbDtPHKkKIF43JYdmWxXPGpolqj75RGUVqLXyKm NYIeYkNXy+5i4peG0WknFQikq6IaYpCnLxWBh9AnsYKNNxbYbY3CZo5oMhM/qRBrJHPP PElQ== X-Gm-Message-State: AOAM531IHAzquFz3GQr8I0UJ6kKIxKXU+cz3SFDLxzvfMhX8IEwsBQ46 tGqgTL+F/jRalvRczg1scZCeO10Qxe7P8+9Gx47GDqrC8uCcFgTkjKhkbOFIXytMUJxW0VwJcdu 2I5FMBKQ7kX0oom8F1izIomKfNkAxhhq20q3JueAd3MyUavn7blDBQr1mFdNJ4pT2yZlUfSw= X-Google-Smtp-Source: ABdhPJxEhfx5WUV7uAe1ROZNxdkT4mcgzDqyoZGKSqr0DUXikqzRUlnqQdwHy3Im7dFS20J3kEtfhd5/ZXRBLQ== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a0c:efc9:: with SMTP id a9mr34339659qvt.31.1607987359607; Mon, 14 Dec 2020 15:09:19 -0800 (PST) Date: Mon, 14 Dec 2020 23:08:55 +0000 In-Reply-To: <20201214230855.1574934-1-maennich@google.com> Message-Id: <20201214230855.1574934-6-maennich@google.com> Mime-Version: 1.0 References: <20201214230855.1574934-1-maennich@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH 5/6] Remove usages from abg_compat To: libabigail@sourceware.org X-Spam-Status: No, score=-22.2 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" std::unordered_set is now provided through the language standard, hence remove the compatibility code for and adjust all users accordingly. * include/abg-cxx-compat.h: Drop compatibility for . * include/abg-comparison.h: migrate abg_compat use to std. * include/abg-interned-str.h: Likewise. * include/abg-suppression.h: Likewise. * src/abg-comparison-priv.h: Likewise. * src/abg-dwarf-reader.cc: Likewise. * tests/test-diff-suppr.cc: Likewise. * tools/abipkgdiff.cc: Likewise. Signed-off-by: Matthias Maennich --- include/abg-comparison.h | 3 ++- include/abg-cxx-compat.h | 5 ----- include/abg-interned-str.h | 3 ++- include/abg-suppression.h | 4 +++- src/abg-comparison-priv.h | 3 ++- src/abg-dwarf-reader.cc | 3 ++- tests/test-diff-suppr.cc | 3 ++- tools/abipkgdiff.cc | 3 ++- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/include/abg-comparison.h b/include/abg-comparison.h index c9e8df7624d2..1da8215ef19e 100644 --- a/include/abg-comparison.h +++ b/include/abg-comparison.h @@ -12,6 +12,7 @@ #include #include +#include #include "abg-cxx-compat.h" #include "abg-corpus.h" #include "abg-diff-utils.h" @@ -38,7 +39,7 @@ typedef std::vector filters; using std::ostream; using std::vector; using std::unordered_map; -using abg_compat::unordered_set; +using std::unordered_set; using std::pair; using diff_utils::insertion; diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h index fd693933d65f..838fa53707d1 100644 --- a/include/abg-cxx-compat.h +++ b/include/abg-cxx-compat.h @@ -8,13 +8,8 @@ #ifndef __ABG_CXX_COMPAT_H #define __ABG_CXX_COMPAT_H -#include - namespace abg_compat { -// -using std::unordered_set; - } #endif // __ABG_CXX_COMPAT_H diff --git a/include/abg-interned-str.h b/include/abg-interned-str.h index ed6499090c43..bd51350edd33 100644 --- a/include/abg-interned-str.h +++ b/include/abg-interned-str.h @@ -20,13 +20,14 @@ #include #include #include +#include #include "abg-cxx-compat.h" namespace abigail { // Inject some std types into this namespace. -using abg_compat::unordered_set; +using std::unordered_set; using std::shared_ptr; using std::string; using std::ostream; diff --git a/include/abg-suppression.h b/include/abg-suppression.h index dd575916068c..9c135607b42f 100644 --- a/include/abg-suppression.h +++ b/include/abg-suppression.h @@ -8,6 +8,8 @@ #ifndef __ABG_SUPPRESSION_H__ #define __ABG_SUPPRESSION_H__ +#include + #include "abg-cxx-compat.h" #include "abg-ini.h" #include "abg-comparison.h" @@ -28,7 +30,7 @@ namespace suppr { using namespace abigail::comparison; -using abg_compat::unordered_set; +using std::unordered_set; /// Base type of the suppression specifications types. /// diff --git a/src/abg-comparison-priv.h b/src/abg-comparison-priv.h index 1f04f3cbb61a..7b3587d8808d 100644 --- a/src/abg-comparison-priv.h +++ b/src/abg-comparison-priv.h @@ -20,6 +20,7 @@ #include "abg-internal.h" // #include +#include ABG_BEGIN_EXPORT_DECLARATIONS #include "abg-hash.h" @@ -38,7 +39,7 @@ namespace abigail namespace comparison { -using abg_compat::unordered_set; +using std::unordered_set; using namespace abigail::suppr; // Inject types from outside in here. diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index c3723ae15236..2e137b211e71 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -31,6 +31,7 @@ #include #include #include +#include #include "abg-cxx-compat.h" #include "abg-ir-priv.h" @@ -67,7 +68,7 @@ namespace dwarf_reader using std::dynamic_pointer_cast; using std::static_pointer_cast; using std::unordered_map; -using abg_compat::unordered_set; +using std::unordered_set; using std::stack; using std::deque; using std::list; diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc index f6548d066391..0f7c448c7600 100644 --- a/tests/test-diff-suppr.cc +++ b/tests/test-diff-suppr.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include "abg-cxx-compat.h" #include "abg-tools-utils.h" #include "abg-workers.h" @@ -2156,7 +2157,7 @@ main(int argc, char *argv[]) const std::string out_base_path = std::string(get_build_dir()) + "/tests/"; // output paths need to be unique to avoid collisions during parallel testing - abg_compat::unordered_set out_paths; + std::unordered_set out_paths; bool non_unique_output_paths = false; for (InOutSpec* s = in_out_specs; s->in_elfv0_path; ++s) { if (!out_paths.insert(s->out_report_path).second) { diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc index 6c2c6a53bad3..3decc9205729 100644 --- a/tools/abipkgdiff.cc +++ b/tools/abipkgdiff.cc @@ -79,6 +79,7 @@ #include #include #include +#include #include #include "abg-cxx-compat.h" @@ -98,7 +99,7 @@ using std::ostream; using std::ofstream; using std::vector; using std::map; -using abg_compat::unordered_set; +using std::unordered_set; using std::set; using std::ostringstream; using std::shared_ptr; From patchwork Mon Dec 14 23:08:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Matthias_M=C3=A4nnich?= X-Patchwork-Id: 41387 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A7AB03858D29; Mon, 14 Dec 2020 23:09:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7AB03858D29 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607987365; bh=DkG5eCY5CVzOU+7rzmSZErCQaVlTeF0CyuKa+bBy4cI=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=DyqGaRhy/S0TYDO7RgCACfnrbUraqId7He4/0rs1diwhSE7NFoGDZWLbQiZTAuxrx CJZPeG2RvmxgKCJMktbObLfeIdrWN90DD7HKwOg4i5WrjarZrrAUFjVtgTd8e5TJCQ XXy+0khw1kOWt9txp18W4x5xUOmm2m1YVr4hQCs4= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wr1-x449.google.com (mail-wr1-x449.google.com [IPv6:2a00:1450:4864:20::449]) by sourceware.org (Postfix) with ESMTPS id C2A3E3858D29 for ; Mon, 14 Dec 2020 23:09:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C2A3E3858D29 Received: by mail-wr1-x449.google.com with SMTP id e12so5772827wrp.10 for ; Mon, 14 Dec 2020 15:09:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=DkG5eCY5CVzOU+7rzmSZErCQaVlTeF0CyuKa+bBy4cI=; b=uEWEdsiME0QDEdO1h3D20WdewAojnnNOT8pMRyk559hVcebvHPBybChXKe/aGfTmVQ lVhru1zsgjPd1xIANd2Pbz7J71f1M8WX34YQ/LQQjQaQiARlCCGaFGaYpu8RQVofMtgB m/ZUrdEAPQMdh3J4Lf7KDzdDYqsUIMlC4nw/vVy8TWIvxk9HV/ff4q8A7M/aKSLxOWmc H5bM63D5b42OelEPS0Ti1uateoBfJs+tk7KrWSCiKk0xJqrzF/GrY503K96z0baH0Ydh chwRaCuFmtRwvZpc7QiKAXFgG7U5sWv71jcvJm/zlSE+KVFr87e9Da2hNXWsd2gXuA5+ 0dkQ== X-Gm-Message-State: AOAM530IE+Fwma91T1KkCuDqRETgoO0lw0R1KOdQuDy2hAGjgXT3HDce zwEphvMEJpGeYDKh0XIjLEIIlD8r3vgzB9fBLbOb1gfATtsv6duRATmRob16cq0DaWQLBcJy50W ZPKWaLoKfbSVFbPS5RyQ6gjV1NwJhXihe+kyqFQHbZLjdz5ZCVZfPM8tiTi58xbNujDRWDaU= X-Google-Smtp-Source: ABdhPJzGEygftm7ynaiQjGgMgnPpgq5Z+BJl1OBCjS6/+YOIh1uIaXKHCtz9uxzqrXN5kw6673/0h6kSjI5VQQ== X-Received: from lux.lon.corp.google.com ([2a00:79e0:d:210:7220:84ff:fe09:a3aa]) (user=maennich job=sendgmr) by 2002:a1c:2c89:: with SMTP id s131mr416wms.0.1607987361600; Mon, 14 Dec 2020 15:09:21 -0800 (PST) Date: Mon, 14 Dec 2020 23:08:56 +0000 In-Reply-To: <20201214230855.1574934-1-maennich@google.com> Message-Id: <20201214230855.1574934-7-maennich@google.com> Mime-Version: 1.0 References: <20201214230855.1574934-1-maennich@google.com> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog Subject: [PATCH 6/6] Drop unneccessary includes of abg-cxx-compat.h To: libabigail@sourceware.org X-Spam-Status: No, score=-23.4 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Matthias Maennich via Libabigail From: =?utf-8?q?Matthias_M=C3=A4nnich?= Reply-To: Matthias Maennich Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" Remove the unneccessary includes of abg-cxx-compat.h as users have been migrated to use the corresponding standard includes. * include/abg-comparison.h: Remove include of abg-cxx-compat.h. * include/abg-diff-utils.h: Likewise. * include/abg-fwd.h: Likewise. * include/abg-ini.h: Likewise. * include/abg-interned-str.h: Likewise. * include/abg-ir.h: Likewise. * include/abg-libxml-utils.h: Likewise. * include/abg-libzip-utils.h: Likewise. * include/abg-regex.h: Likewise. * include/abg-reporter.h: Likewise. * include/abg-sptr-utils.h: Likewise. * include/abg-suppression.h: Likewise. * include/abg-tools-utils.h: Likewise. * include/abg-workers.h: Likewise. * src/abg-comp-filter.cc: Likewise. * src/abg-comparison-priv.h: Likewise. * src/abg-corpus.cc: Likewise. * src/abg-dwarf-reader.cc: Likewise. * src/abg-hash.cc: Likewise. * src/abg-ir.cc: Likewise. * src/abg-reader.cc: Likewise. * src/abg-suppression.cc: Likewise. * src/abg-tools-utils.cc: Likewise. * src/abg-writer.cc: Likewise. * tests/test-diff-suppr.cc: Likewise. * tests/test-read-write.cc: Likewise. * tools/abicompat.cc: Likewise. * tools/abidw.cc: Likewise. * tools/abilint.cc: Likewise. * tools/abipkgdiff.cc: Likewise. Signed-off-by: Matthias Maennich --- include/abg-comparison.h | 1 - include/abg-diff-utils.h | 1 - include/abg-fwd.h | 1 - include/abg-ini.h | 1 - include/abg-interned-str.h | 1 - include/abg-ir.h | 1 - include/abg-libxml-utils.h | 1 - include/abg-libzip-utils.h | 1 - include/abg-regex.h | 1 - include/abg-reporter.h | 1 - include/abg-sptr-utils.h | 1 - include/abg-suppression.h | 1 - include/abg-tools-utils.h | 1 - include/abg-workers.h | 1 - src/abg-comp-filter.cc | 1 - src/abg-comparison-priv.h | 1 - src/abg-corpus.cc | 1 - src/abg-dwarf-reader.cc | 1 - src/abg-hash.cc | 1 - src/abg-ir.cc | 1 - src/abg-reader.cc | 1 - src/abg-suppression.cc | 1 - src/abg-tools-utils.cc | 1 - src/abg-writer.cc | 1 - tests/test-diff-suppr.cc | 1 - tests/test-read-write.cc | 1 - tools/abicompat.cc | 1 - tools/abidw.cc | 1 - tools/abilint.cc | 1 - tools/abipkgdiff.cc | 1 - 30 files changed, 30 deletions(-) diff --git a/include/abg-comparison.h b/include/abg-comparison.h index 1da8215ef19e..eab2850b1e32 100644 --- a/include/abg-comparison.h +++ b/include/abg-comparison.h @@ -13,7 +13,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-corpus.h" #include "abg-diff-utils.h" #include "abg-reporter.h" diff --git a/include/abg-diff-utils.h b/include/abg-diff-utils.h index 89eee495282d..0628950e2473 100644 --- a/include/abg-diff-utils.h +++ b/include/abg-diff-utils.h @@ -29,7 +29,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-fwd.h" namespace abigail diff --git a/include/abg-fwd.h b/include/abg-fwd.h index 4d594afaccf6..bb839fe76315 100644 --- a/include/abg-fwd.h +++ b/include/abg-fwd.h @@ -19,7 +19,6 @@ #include #include // for std::rel_ops, at least. #include -#include "abg-cxx-compat.h" #include "abg-interned-str.h" #include "abg-hash.h" diff --git a/include/abg-ini.h b/include/abg-ini.h index 665cdcd3d664..4ccb63bc4550 100644 --- a/include/abg-ini.h +++ b/include/abg-ini.h @@ -18,7 +18,6 @@ #include #include #include -#include "abg-cxx-compat.h" namespace abigail { diff --git a/include/abg-interned-str.h b/include/abg-interned-str.h index bd51350edd33..e25ea566d656 100644 --- a/include/abg-interned-str.h +++ b/include/abg-interned-str.h @@ -21,7 +21,6 @@ #include #include #include -#include "abg-cxx-compat.h" namespace abigail diff --git a/include/abg-ir.h b/include/abg-ir.h index 06e03b5f14c9..ada947d7849b 100644 --- a/include/abg-ir.h +++ b/include/abg-ir.h @@ -21,7 +21,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-fwd.h" #include "abg-hash.h" #include "abg-traverse.h" diff --git a/include/abg-libxml-utils.h b/include/abg-libxml-utils.h index 081bd8f2e908..69e940f6dffb 100644 --- a/include/abg-libxml-utils.h +++ b/include/abg-libxml-utils.h @@ -14,7 +14,6 @@ #include #include "abg-sptr-utils.h" -#include "abg-cxx-compat.h" namespace abigail { diff --git a/include/abg-libzip-utils.h b/include/abg-libzip-utils.h index 82378fa18f25..dc431d185a33 100644 --- a/include/abg-libzip-utils.h +++ b/include/abg-libzip-utils.h @@ -10,7 +10,6 @@ #include #include -#include "abg-cxx-compat.h" namespace abigail { diff --git a/include/abg-regex.h b/include/abg-regex.h index 477ebbb94a3d..9d8310fb9a8d 100644 --- a/include/abg-regex.h +++ b/include/abg-regex.h @@ -16,7 +16,6 @@ #include #include -#include "abg-cxx-compat.h" #include "abg-sptr-utils.h" namespace abigail diff --git a/include/abg-reporter.h b/include/abg-reporter.h index 22d4d4258322..2374f6b37fed 100644 --- a/include/abg-reporter.h +++ b/include/abg-reporter.h @@ -16,7 +16,6 @@ #include #include #include -#include "abg-cxx-compat.h" namespace abigail { diff --git a/include/abg-sptr-utils.h b/include/abg-sptr-utils.h index 65def7d2f4f7..ef39703acdfe 100644 --- a/include/abg-sptr-utils.h +++ b/include/abg-sptr-utils.h @@ -13,7 +13,6 @@ #include #include -#include "abg-cxx-compat.h" namespace abigail { diff --git a/include/abg-suppression.h b/include/abg-suppression.h index 9c135607b42f..de2c60193887 100644 --- a/include/abg-suppression.h +++ b/include/abg-suppression.h @@ -10,7 +10,6 @@ #include -#include "abg-cxx-compat.h" #include "abg-ini.h" #include "abg-comparison.h" diff --git a/include/abg-tools-utils.h b/include/abg-tools-utils.h index 14781a456301..053f8795e04b 100644 --- a/include/abg-tools-utils.h +++ b/include/abg-tools-utils.h @@ -14,7 +14,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-suppression.h" namespace abigail diff --git a/include/abg-workers.h b/include/abg-workers.h index 4cbff8308e42..5b5524471e1c 100644 --- a/include/abg-workers.h +++ b/include/abg-workers.h @@ -18,7 +18,6 @@ #include #include -#include "abg-cxx-compat.h" using std::shared_ptr; diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc index a3320091c309..a0280d8eddf1 100644 --- a/src/abg-comp-filter.cc +++ b/src/abg-comp-filter.cc @@ -10,7 +10,6 @@ /// This file contains definitions of diff objects filtering /// facilities. -#include "abg-cxx-compat.h" #include "abg-internal.h" #include // diff --git a/src/abg-comparison-priv.h b/src/abg-comparison-priv.h index 7b3587d8808d..8e2e59c6bcb6 100644 --- a/src/abg-comparison-priv.h +++ b/src/abg-comparison-priv.h @@ -16,7 +16,6 @@ #ifndef __ABG_COMPARISON_PRIV_H__ #define __ABG_COMPARISON_PRIV_H__ -#include "abg-cxx-compat.h" #include "abg-internal.h" // #include diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc index e2319d186259..2c37e253cf88 100644 --- a/src/abg-corpus.cc +++ b/src/abg-corpus.cc @@ -14,7 +14,6 @@ #include #include -#include "abg-cxx-compat.h" #include "abg-internal.h" // diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc index 2e137b211e71..2eee213f358a 100644 --- a/src/abg-dwarf-reader.cc +++ b/src/abg-dwarf-reader.cc @@ -33,7 +33,6 @@ #include #include -#include "abg-cxx-compat.h" #include "abg-ir-priv.h" #include "abg-suppression-priv.h" #include "abg-corpus-priv.h" diff --git a/src/abg-hash.cc b/src/abg-hash.cc index 7b54c177379a..ffa529e805cd 100644 --- a/src/abg-hash.cc +++ b/src/abg-hash.cc @@ -6,7 +6,6 @@ /// @file #include -#include "abg-cxx-compat.h" #include "abg-internal.h" // ABG_BEGIN_EXPORT_DECLARATIONS diff --git a/src/abg-ir.cc b/src/abg-ir.cc index 5f931ee79509..1a4091b9370c 100644 --- a/src/abg-ir.cc +++ b/src/abg-ir.cc @@ -20,7 +20,6 @@ #include #include -#include "abg-cxx-compat.h" #include "abg-internal.h" // ABG_BEGIN_EXPORT_DECLARATIONS diff --git a/src/abg-reader.cc b/src/abg-reader.cc index fb7326ed1b81..1fb0cf7d1074 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -22,7 +22,6 @@ #include #include -#include "abg-cxx-compat.h" #include "abg-suppression-priv.h" #include "abg-internal.h" diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc index 4b955da7647b..d3343a814ef4 100644 --- a/src/abg-suppression.cc +++ b/src/abg-suppression.cc @@ -12,7 +12,6 @@ #include -#include "abg-cxx-compat.h" #include "abg-internal.h" #include diff --git a/src/abg-tools-utils.cc b/src/abg-tools-utils.cc index 7df3da5ffbfc..4d0191326dab 100644 --- a/src/abg-tools-utils.cc +++ b/src/abg-tools-utils.cc @@ -45,7 +45,6 @@ #include "abg-dwarf-reader.h" #include "abg-internal.h" -#include "abg-cxx-compat.h" #include "abg-regex.h" // diff --git a/src/abg-writer.cc b/src/abg-writer.cc index 0953c8b3c7ee..d55bbbc166d5 100644 --- a/src/abg-writer.cc +++ b/src/abg-writer.cc @@ -22,7 +22,6 @@ #include #include -#include "abg-cxx-compat.h" #include "abg-tools-utils.h" #include "abg-internal.h" diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc index 0f7c448c7600..c7b73fd6d067 100644 --- a/tests/test-diff-suppr.cc +++ b/tests/test-diff-suppr.cc @@ -23,7 +23,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-tools-utils.h" #include "abg-workers.h" #include "test-utils.h" diff --git a/tests/test-read-write.cc b/tests/test-read-write.cc index 1cddc0ea9220..ffca005251c0 100644 --- a/tests/test-read-write.cc +++ b/tests/test-read-write.cc @@ -14,7 +14,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-ir.h" #include "abg-reader.h" #include "abg-writer.h" diff --git a/tools/abicompat.cc b/tools/abicompat.cc index 2007a391932f..f9b019fbd0c6 100644 --- a/tools/abicompat.cc +++ b/tools/abicompat.cc @@ -34,7 +34,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-config.h" #include "abg-tools-utils.h" #include "abg-corpus.h" diff --git a/tools/abidw.cc b/tools/abidw.cc index 9e8251f63cc5..bf4de28324d0 100644 --- a/tools/abidw.cc +++ b/tools/abidw.cc @@ -21,7 +21,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-config.h" #include "abg-tools-utils.h" #include "abg-corpus.h" diff --git a/tools/abilint.cc b/tools/abilint.cc index 63d0d6b8a1f9..aaf500f72818 100644 --- a/tools/abilint.cc +++ b/tools/abilint.cc @@ -21,7 +21,6 @@ #include #include #include -#include "abg-cxx-compat.h" #include "abg-config.h" #include "abg-tools-utils.h" #include "abg-ir.h" diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc index 3decc9205729..783a8d9a5359 100644 --- a/tools/abipkgdiff.cc +++ b/tools/abipkgdiff.cc @@ -82,7 +82,6 @@ #include #include -#include "abg-cxx-compat.h" #include "abg-workers.h" #include "abg-config.h" #include "abg-tools-utils.h"