reenable gcc warnings for deprecated functions

In the meantime the strange warnings disappeared, so we can get back to
showing them – and fix the one occurance which creeped in in the
meantime.

Git-Dch: Ignore

diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index bf0edb94175c5697a941691746aad2c6caf3b22c..51fbc72fbf2cbf084ecfd088f252203835f93eb6 100644 (file)
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -14,8 +14,6 @@ CXXFLAGS+= -Wcast-align -Wlogical-op -Wredundant-decls -Wmissing-declarations -W
 CXXFLAGS+= -Wctor-dtor-privacy -Wdisabled-optimization -Winit-self -Wmissing-include-dirs -Wnoexcept -Wsign-promo -Wundef
 # suggests methods which already have such an attribute
 #CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn
 CXXFLAGS+= -Wctor-dtor-privacy -Wdisabled-optimization -Winit-self -Wmissing-include-dirs -Wnoexcept -Wsign-promo -Wundef
 # suggests methods which already have such an attribute
 #CXXFLAGS+= -Wsuggest-attribute=pure -Wsuggest-attribute=const -Wsuggest-attribute=noreturn

-# gcc reports currently lots of them at the end of file - unknown reason
-CXXFLAGS+= -Wno-deprecated-declarations

 # sanitize options to be enabled for testing
 #CXXFLAGS+= -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr
 # a bit too pedantic to be run by default
 # sanitize options to be enabled for testing
 #CXXFLAGS+= -fsanitize=address -fsanitize=undefined -fno-sanitize=vptr
 # a bit too pedantic to be run by default

diff --git a/ftparchive/byhash.cc b/ftparchive/byhash.cc
index 04f8f1629f7117475b390cdda737fb04be492735..0a38457c0f657cd57c51ebeeb546936b92e16e12 100644 (file)
--- a/ftparchive/byhash.cc
+++ b/ftparchive/byhash.cc
@@ -48,9 +48,8 @@ void DeleteAllButMostRecent(std::string dir, int KeepFiles)
 
 // Takes a input filename (e.g. binary-i386/Packages) and a hashstring
 // of the Input data and transforms it into a suitable by-hash filename
 
 // Takes a input filename (e.g. binary-i386/Packages) and a hashstring
 // of the Input data and transforms it into a suitable by-hash filename

-std::string GenByHashFilename(std::string Input, HashString h)
+std::string GenByHashFilename(std::string ByHashOutputFile, HashString const &h)

 {
 {

-   std::string ByHashOutputFile = Input;

    std::string const ByHash = "/by-hash/" + h.HashType() + "/" + h.HashValue();
    size_t trailing_slash = ByHashOutputFile.find_last_of("/");
    if (trailing_slash == std::string::npos)
    std::string const ByHash = "/by-hash/" + h.HashType() + "/" + h.HashValue();
    size_t trailing_slash = ByHashOutputFile.find_last_of("/");
    if (trailing_slash == std::string::npos)

diff --git a/ftparchive/byhash.h b/ftparchive/byhash.h
index ce05397ad5d517fe3f6cf65531708f1a7431e059..9fbb479a78bad73684de50e35f827a47d24d9f87 100644 (file)
--- a/ftparchive/byhash.h
+++ b/ftparchive/byhash.h
@@ -11,6 +11,8 @@
 #ifndef BYHASH_H
 #define BYHASH_H
 
 #ifndef BYHASH_H
 #define BYHASH_H
 

+#include <string>
+

 class HashString;
 
 // Delete all files in "dir" except for the number specified in "KeepFiles"
 class HashString;
 
 // Delete all files in "dir" except for the number specified in "KeepFiles"


@@ -18,6 +20,6 @@ class HashString;
 void DeleteAllButMostRecent(std::string dir, int KeepFiles);
 
 // takes a regular input filename
 void DeleteAllButMostRecent(std::string dir, int KeepFiles);
 
 // takes a regular input filename

-std::string GenByHashFilename(std::string Input, HashString h);
+std::string GenByHashFilename(std::string Input, HashString const &h);

 
 #endif
 
 #endif