mirror of
git://sourceware.org/git/libabigail.git
synced 2025-02-13 12:07:06 +00:00
Introduce a compatibility layer for C++11 code by adding include/abg-cxx-compat.h. abg-cxx-compat defines a new namespace abg_compat and defines abg_compat::hash abg_compat::shared_ptr abg_compat::weak_ptr abg_compat::dynamic_pointer_cast abg_compat::static_pointer_cast abg_compat::unordered_map abg_compat::unordered_set based on definitions from std::tr1 (std=gnu++98) or std:: (std=gnu++11). I decided for introducing abg_compat:: rather than polluting abigail:: to allow an easier transition to C++11 at a later time and to not subtly break existing code. As the shared_ptr in C++11 defines shared_ptr::operator bool() explicit, some locations where a shared_ptr is assigned to boolean, needed to be adjusted to explicitly cast to bool. * include/abg-cxx-compat.h: new file introducing the abg_compat namespace to provide C++11 functionality from either std::tr1 or std:: * include/Makefile.am: Add the new abg-cxx-compat.h to source distribution. * include/abg-comparison.h: replace std::tr1 usage by abg_compat and adjust includes accordingly: likewise * 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-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-filter.cc: likewise * tests/test-diff-pkg.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 <maennich@google.com> Signed-off-by: Dodji Seketeli <dodji@redhat.com>
73 lines
1.9 KiB
C++
73 lines
1.9 KiB
C++
// -*- mode: C++ -*-
|
|
//
|
|
// Copyright (C) 2013-2019 Red Hat, Inc.
|
|
//
|
|
// This file is part of the GNU Application Binary Interface Generic
|
|
// Analysis and Instrumentation Library (libabigail). This library is
|
|
// free software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU Lesser General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option) any
|
|
// later version.
|
|
|
|
// This library is distributed in the hope that it will be useful, but
|
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// General Lesser Public License for more details.
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this program; see the file COPYING-LGPLV3. If
|
|
// not, see <http://www.gnu.org/licenses/>.
|
|
|
|
/// @file
|
|
|
|
#include <zip.h>
|
|
#include "abg-cxx-compat.h"
|
|
|
|
namespace abigail
|
|
{
|
|
|
|
namespace zip_utils
|
|
{
|
|
|
|
using abg_compat::shared_ptr;
|
|
using std::string;
|
|
|
|
/// @brief Functor passed to shared_ptr constructor during
|
|
/// instantiation with zip*
|
|
///
|
|
/// Its aim is to delete zip* managed by shared_ptr.
|
|
struct archive_deleter
|
|
{
|
|
void
|
|
operator()(zip* archive)
|
|
{
|
|
/// ??? Maybe check the return code of close and throw if the
|
|
/// close fails? But then callers must be prepared to handle
|
|
/// this.
|
|
zip_close(archive);
|
|
}
|
|
};//end archive_deleter
|
|
|
|
/// @brief Functor passed to shared_ptr<zip_file>'s constructor.
|
|
///
|
|
/// Its aim is to close (actually delete) the zip_file* managed by the
|
|
/// shared_ptr.
|
|
struct zip_file_deleter
|
|
{
|
|
void
|
|
operator()(zip_file*f)
|
|
{
|
|
zip_fclose(f);
|
|
}
|
|
};
|
|
|
|
typedef shared_ptr<zip> zip_sptr;
|
|
zip_sptr open_archive(const string& path, int flags, int *errorp);
|
|
|
|
typedef shared_ptr<zip_file> zip_file_sptr;
|
|
zip_file_sptr open_file_in_archive(zip_sptr archive,
|
|
int file_index);
|
|
|
|
}// end namespace zip
|
|
}// end namespace abigail
|