From f8043f219f077b1cfc6c5ad2263c4caa4709a00d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 14 Aug 2015 19:44:25 +0200 Subject: Make apt compile with clang++ again This allows us to run the clang static analyzer and to run the testsuite with the clang MemorySanitizer. --- apt-pkg/aptconfiguration.cc | 2 +- apt-pkg/srcrecords.cc | 2 +- methods/ftp.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 01b85a74e..7e20a7d61 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -222,7 +222,7 @@ std::vector const Configuration::getLanguages(bool const &All, // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will // check if we actually need both (rare) or if the short is enough - string const envMsg = string(Locale == 0 ? std::setlocale(LC_MESSAGES, NULL) : *Locale); + string const envMsg = string(Locale == 0 ? ::setlocale(LC_MESSAGES, NULL) : *Locale); size_t const lenShort = (envMsg.find('_') != string::npos) ? envMsg.find('_') : 2; size_t const lenLong = (envMsg.find_first_of(".@") != string::npos) ? envMsg.find_first_of(".@") : (lenShort + 3); diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index e3ffa9ab0..942f11569 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -31,7 +31,7 @@ // SrcRecords::pkgSrcRecords - Constructor /*{{{*/ // --------------------------------------------------------------------- /* Open all the source index files */ -pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : d(NULL), Files(0), Current(0) +pkgSrcRecords::pkgSrcRecords(pkgSourceList &List) : d(NULL), Files(0) { for (pkgSourceList::const_iterator I = List.begin(); I != List.end(); ++I) { diff --git a/methods/ftp.cc b/methods/ftp.cc index 5fee20f23..1a9a1c4eb 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -745,7 +745,7 @@ bool FTPConn::CreateDataFd() } // Bind and listen - if (bind(DataListenFd,BindAddr->ai_addr,BindAddr->ai_addrlen) < 0) + if (::bind(DataListenFd,BindAddr->ai_addr,BindAddr->ai_addrlen) < 0) { freeaddrinfo(BindAddr); return _error->Errno("bind",_("Could not bind a socket")); -- cgit v1.2.3