From: Joel Rosdahl Date: Fri, 31 Jul 2020 18:10:13 +0000 (+0200) Subject: Remove now empty legacy_util.[hc]pp files X-Git-Tag: v4.0~238 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f95710f574fe532af7297aab0191ca2d94a12de;p=thirdparty%2Fccache.git Remove now empty legacy_util.[hc]pp files --- diff --git a/src/AtomicFile.cpp b/src/AtomicFile.cpp index 1a2879a7c..b227af4f7 100644 --- a/src/AtomicFile.cpp +++ b/src/AtomicFile.cpp @@ -21,7 +21,6 @@ #include "TemporaryFile.hpp" #include "Util.hpp" #include "exceptions.hpp" -#include "legacy_util.hpp" #include "third_party/fmt/core.h" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f28c192a9..7457b5595 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,7 +36,6 @@ set( execute.cpp hashutil.cpp language.cpp - legacy_util.cpp logging.cpp manifest.cpp stats.cpp diff --git a/src/Config.hpp b/src/Config.hpp index 0cfbac879..896e3de18 100644 --- a/src/Config.hpp +++ b/src/Config.hpp @@ -22,7 +22,6 @@ #include "NonCopyable.hpp" #include "Util.hpp" -#include "legacy_util.hpp" #include "third_party/nonstd/optional.hpp" diff --git a/src/Lockfile.cpp b/src/Lockfile.cpp index 97e31b1e4..4e27bef36 100644 --- a/src/Lockfile.cpp +++ b/src/Lockfile.cpp @@ -19,7 +19,6 @@ #include "Lockfile.hpp" #include "Util.hpp" -#include "legacy_util.hpp" #include "logging.hpp" #ifdef _WIN32 diff --git a/src/MiniTrace.cpp b/src/MiniTrace.cpp index 6174b2ca3..3cba8ecd8 100644 --- a/src/MiniTrace.cpp +++ b/src/MiniTrace.cpp @@ -24,7 +24,6 @@ # include "MiniTrace.hpp" # include "TemporaryFile.hpp" # include "Util.hpp" -# include "legacy_util.hpp" # ifdef HAVE_SYS_TIME_H # include diff --git a/src/TemporaryFile.cpp b/src/TemporaryFile.cpp index e057c795f..3acc30460 100644 --- a/src/TemporaryFile.cpp +++ b/src/TemporaryFile.cpp @@ -19,7 +19,6 @@ #include "TemporaryFile.hpp" #include "Util.hpp" -#include "legacy_util.hpp" using nonstd::string_view; diff --git a/src/Util.cpp b/src/Util.cpp index 23bb4839a..e445cdba9 100644 --- a/src/Util.cpp +++ b/src/Util.cpp @@ -23,7 +23,6 @@ #include "Fd.hpp" #include "FormatNonstdStringView.hpp" #include "TemporaryFile.hpp" -#include "legacy_util.hpp" #include "logging.hpp" #include diff --git a/src/compopt.cpp b/src/compopt.cpp index 74899830a..1a0aabd0b 100644 --- a/src/compopt.cpp +++ b/src/compopt.cpp @@ -18,8 +18,6 @@ #include "compopt.hpp" -#include "legacy_util.hpp" - // The option it too hard to handle at all. #define TOO_HARD (1 << 0) diff --git a/src/legacy_util.cpp b/src/legacy_util.cpp deleted file mode 100644 index 51d474a7e..000000000 --- a/src/legacy_util.cpp +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2002 Andrew Tridgell -// Copyright (C) 2009-2020 Joel Rosdahl and other contributors -// -// See doc/AUTHORS.adoc for a complete list of contributors. -// -// This program is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 3 of the License, or (at your option) -// any later version. -// -// This program 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 Public License for -// more details. -// -// You should have received a copy of the GNU General Public License along with -// this program; if not, write to the Free Software Foundation, Inc., 51 -// Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -#include "legacy_util.hpp" - -#include "Fd.hpp" -#include "exceptions.hpp" -#include "logging.hpp" - -#ifdef _WIN32 -# include "Win32Util.hpp" -#endif - -#ifdef HAVE_SYS_TIME_H -# include -#endif diff --git a/src/legacy_util.hpp b/src/legacy_util.hpp deleted file mode 100644 index fd2dba406..000000000 --- a/src/legacy_util.hpp +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (C) 2020 Joel Rosdahl and other contributors -// -// See doc/AUTHORS.adoc for a complete list of contributors. -// -// This program is free software; you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 3 of the License, or (at your option) -// any later version. -// -// This program 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 Public License for -// more details. -// -// You should have received a copy of the GNU General Public License along with -// this program; if not, write to the Free Software Foundation, Inc., 51 -// Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -#pragma once - -#include "system.hpp" - -#include