Browse Source

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
tags/debian/1.1_exp15
David Kalnischkies 5 years ago
parent
commit
e2ea6b63d3
3 changed files with 4 additions and 5 deletions
  1. +0
    -2
      buildlib/environment.mak.in
  2. +1
    -2
      ftparchive/byhash.cc
  3. +3
    -1
      ftparchive/byhash.h

+ 0
- 2
buildlib/environment.mak.in View File

@@ -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
# 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


+ 1
- 2
ftparchive/byhash.cc View File

@@ -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
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)


+ 3
- 1
ftparchive/byhash.h View File

@@ -11,6 +11,8 @@
#ifndef BYHASH_H
#define BYHASH_H

#include <string>

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
std::string GenByHashFilename(std::string Input, HashString h);
std::string GenByHashFilename(std::string Input, HashString const &h);

#endif

Loading…
Cancel
Save