Remove now empty legacy_util.[hc]pp files

diff --git a/src/AtomicFile.cpp b/src/AtomicFile.cpp
index 1a2879a7c00beedb474670553eb81ac00d974dca..b227af4f73d9cdb5652792f17824048b93e0245a 100644 (file)
--- 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 f28c192a9bdec90db3e91f3db5daec3e00ab611d..7457b5595a4dbe849548db18523156061a411fa0 100644 (file)
--- 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 0cfbac8794a8a8fb1a956e523744376d060b5497..896e3de18abbca4cf001ec5bc0d3ef46e94e57df 100644 (file)
--- 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 97e31b1e4876727298e4a56b3af906ce84dc67c3..4e27bef3618787d291e8b3a8af659cec7200edec 100644 (file)
--- 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 6174b2ca3ccc8b1fc08ad89c4c2c3b638415d4cf..3cba8ecd8919d0cfa04e3f87151e9f676c5c9a4b 100644 (file)
--- 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 <sys/time.h>

diff --git a/src/TemporaryFile.cpp b/src/TemporaryFile.cpp
index e057c795f8f1b16c24ccd92819caa8a82b96d357..3acc304602da5d03bb0a0ced2245b820b68a451d 100644 (file)
--- 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 23bb4839abd10cddc5fb7dacf0f880897599e767..e445cdba90ab890d2bca09ba33f38c2a0058ba24 100644 (file)
--- 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 <algorithm>

diff --git a/src/compopt.cpp b/src/compopt.cpp
index 74899830a6aae214cb4c35a1af37dadc74699e80..1a0aabd0b2c91b34d0412697a4a82c60fe213edf 100644 (file)
--- 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 (file)
index 51d474a..0000000
--- 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 <sys/time.h>
-#endif

diff --git a/src/legacy_util.hpp b/src/legacy_util.hpp
deleted file mode 100644 (file)
index fd2dba4..0000000
--- 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 <string>