diff options
Diffstat (limited to 'third_party/nix/src/libutil')
21 files changed, 55 insertions, 52 deletions
diff --git a/third_party/nix/src/libutil/affinity.cc b/third_party/nix/src/libutil/affinity.cc index 7db8906eb0..03fbe12439 100644 --- a/third_party/nix/src/libutil/affinity.cc +++ b/third_party/nix/src/libutil/affinity.cc @@ -1,9 +1,9 @@ -#include "affinity.hh" +#include "libutil/affinity.hh" #include <glog/logging.h> -#include "types.hh" -#include "util.hh" +#include "libutil/types.hh" +#include "libutil/util.hh" #if __linux__ #include <sched.h> diff --git a/third_party/nix/src/libutil/archive.cc b/third_party/nix/src/libutil/archive.cc index f78727c5fb..4089809321 100644 --- a/third_party/nix/src/libutil/archive.cc +++ b/third_party/nix/src/libutil/archive.cc @@ -1,4 +1,4 @@ -#include "archive.hh" +#include "libutil/archive.hh" #include <algorithm> #include <cerrno> @@ -7,14 +7,14 @@ #include <dirent.h> #include <fcntl.h> +#include <glog/logging.h> #include <strings.h> // for strcasecmp #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -#include "config.hh" -#include "glog/logging.h" -#include "util.hh" +#include "libutil/config.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libutil/archive.hh b/third_party/nix/src/libutil/archive.hh index 0afa8893ef..07f58b5f94 100644 --- a/third_party/nix/src/libutil/archive.hh +++ b/third_party/nix/src/libutil/archive.hh @@ -1,7 +1,7 @@ #pragma once -#include "serialise.hh" -#include "types.hh" +#include "libutil/serialise.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libutil/args.cc b/third_party/nix/src/libutil/args.cc index 4e7bcb3ae7..c56383ef88 100644 --- a/third_party/nix/src/libutil/args.cc +++ b/third_party/nix/src/libutil/args.cc @@ -1,6 +1,6 @@ -#include "args.hh" +#include "libutil/args.hh" -#include "hash.hh" +#include "libutil/hash.hh" namespace nix { diff --git a/third_party/nix/src/libutil/args.hh b/third_party/nix/src/libutil/args.hh index 2c352a0436..37904b19aa 100644 --- a/third_party/nix/src/libutil/args.hh +++ b/third_party/nix/src/libutil/args.hh @@ -6,7 +6,7 @@ #include <absl/strings/numbers.h> -#include "util.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libutil/compression.cc b/third_party/nix/src/libutil/compression.cc index d7084ab7f1..a50076fcd5 100644 --- a/third_party/nix/src/libutil/compression.cc +++ b/third_party/nix/src/libutil/compression.cc @@ -1,4 +1,4 @@ -#include "compression.hh" +#include "libutil/compression.hh" #include <cstdio> #include <cstring> @@ -7,11 +7,11 @@ #include <brotli/decode.h> #include <brotli/encode.h> #include <bzlib.h> +#include <glog/logging.h> #include <lzma.h> -#include "finally.hh" -#include "glog/logging.h" -#include "util.hh" +#include "libutil/finally.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libutil/compression.hh b/third_party/nix/src/libutil/compression.hh index 80b651e107..8ec340ab74 100644 --- a/third_party/nix/src/libutil/compression.hh +++ b/third_party/nix/src/libutil/compression.hh @@ -2,9 +2,9 @@ #include <string> -#include "ref.hh" -#include "serialise.hh" -#include "types.hh" +#include "libutil/ref.hh" +#include "libutil/serialise.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libutil/config.cc b/third_party/nix/src/libutil/config.cc index 9e3f6f85c5..ebb6b4df1d 100644 --- a/third_party/nix/src/libutil/config.cc +++ b/third_party/nix/src/libutil/config.cc @@ -1,4 +1,4 @@ -#include "config.hh" +#include "libutil/config.hh" #include <string> #include <utility> @@ -9,8 +9,8 @@ #include <absl/strings/string_view.h> #include <glog/logging.h> -#include "args.hh" -#include "json.hh" +#include "libutil/args.hh" +#include "libutil/json.hh" namespace nix { diff --git a/third_party/nix/src/libutil/config.hh b/third_party/nix/src/libutil/config.hh index f8055d4d36..0441e3b9e8 100644 --- a/third_party/nix/src/libutil/config.hh +++ b/third_party/nix/src/libutil/config.hh @@ -1,7 +1,7 @@ #include <map> #include <set> -#include "types.hh" +#include "libutil/types.hh" #pragma once diff --git a/third_party/nix/src/libutil/hash.cc b/third_party/nix/src/libutil/hash.cc index 07a9730551..5c2ddc4bda 100644 --- a/third_party/nix/src/libutil/hash.cc +++ b/third_party/nix/src/libutil/hash.cc @@ -1,4 +1,4 @@ -#include "hash.hh" +#include "libutil/hash.hh" #include <cstring> #include <iostream> @@ -9,9 +9,9 @@ #include <sys/stat.h> #include <sys/types.h> -#include "archive.hh" -#include "istringstream_nocopy.hh" -#include "util.hh" +#include "libutil/archive.hh" +#include "libutil/istringstream_nocopy.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libutil/hash.hh b/third_party/nix/src/libutil/hash.hh index f9c63c155e..34cb41c487 100644 --- a/third_party/nix/src/libutil/hash.hh +++ b/third_party/nix/src/libutil/hash.hh @@ -1,7 +1,7 @@ #pragma once -#include "serialise.hh" -#include "types.hh" +#include "libutil/serialise.hh" +#include "libutil/types.hh" namespace nix { diff --git a/third_party/nix/src/libutil/json.cc b/third_party/nix/src/libutil/json.cc index 218fc264ba..da636e7be9 100644 --- a/third_party/nix/src/libutil/json.cc +++ b/third_party/nix/src/libutil/json.cc @@ -1,4 +1,4 @@ -#include "json.hh" +#include "libutil/json.hh" #include <cstring> #include <iomanip> diff --git a/third_party/nix/src/libutil/pool.hh b/third_party/nix/src/libutil/pool.hh index 6d70795d35..fe6d5c2800 100644 --- a/third_party/nix/src/libutil/pool.hh +++ b/third_party/nix/src/libutil/pool.hh @@ -6,8 +6,8 @@ #include <list> #include <memory> -#include "ref.hh" -#include "sync.hh" +#include "libutil/ref.hh" +#include "libutil/sync.hh" namespace nix { diff --git a/third_party/nix/src/libutil/serialise.cc b/third_party/nix/src/libutil/serialise.cc index 52f0b55426..d02a0205af 100644 --- a/third_party/nix/src/libutil/serialise.cc +++ b/third_party/nix/src/libutil/serialise.cc @@ -1,4 +1,4 @@ -#include "serialise.hh" +#include "libutil/serialise.hh" #include <boost/coroutine2/coroutine.hpp> #include <cerrno> @@ -6,8 +6,9 @@ #include <memory> #include <utility> -#include "glog/logging.h" -#include "util.hh" +#include <glog/logging.h> + +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libutil/serialise.hh b/third_party/nix/src/libutil/serialise.hh index dc877487ee..fbedf0510a 100644 --- a/third_party/nix/src/libutil/serialise.hh +++ b/third_party/nix/src/libutil/serialise.hh @@ -2,8 +2,8 @@ #include <memory> -#include "types.hh" -#include "util.hh" +#include "libutil/types.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libutil/thread-pool.cc b/third_party/nix/src/libutil/thread-pool.cc index 879de446c2..7c6b0a1b46 100644 --- a/third_party/nix/src/libutil/thread-pool.cc +++ b/third_party/nix/src/libutil/thread-pool.cc @@ -1,7 +1,8 @@ -#include "thread-pool.hh" +#include "libutil/thread-pool.hh" -#include "affinity.hh" -#include "glog/logging.h" +#include <glog/logging.h> + +#include "libutil/affinity.hh" namespace nix { diff --git a/third_party/nix/src/libutil/thread-pool.hh b/third_party/nix/src/libutil/thread-pool.hh index 72837ca1ee..23527b907a 100644 --- a/third_party/nix/src/libutil/thread-pool.hh +++ b/third_party/nix/src/libutil/thread-pool.hh @@ -6,8 +6,8 @@ #include <queue> #include <thread> -#include "sync.hh" -#include "util.hh" +#include "libutil/sync.hh" +#include "libutil/util.hh" namespace nix { diff --git a/third_party/nix/src/libutil/types.hh b/third_party/nix/src/libutil/types.hh index ad44719afe..e2ea86fdcf 100644 --- a/third_party/nix/src/libutil/types.hh +++ b/third_party/nix/src/libutil/types.hh @@ -7,7 +7,7 @@ #include <set> #include <string> -#include "ref.hh" +#include "libutil/ref.hh" /* Before 4.7, gcc's std::exception uses empty throw() specifiers for * its (virtual) destructor and what() in c++11 mode, in violation of spec diff --git a/third_party/nix/src/libutil/util.cc b/third_party/nix/src/libutil/util.cc index 3f541134b8..bb6a17e030 100644 --- a/third_party/nix/src/libutil/util.cc +++ b/third_party/nix/src/libutil/util.cc @@ -1,4 +1,4 @@ -#include "util.hh" +#include "libutil/util.hh" #include <cctype> #include <cerrno> @@ -15,6 +15,7 @@ #include <absl/strings/str_split.h> #include <absl/strings/string_view.h> #include <fcntl.h> +#include <glog/logging.h> #include <grp.h> #include <pwd.h> #include <sys/ioctl.h> @@ -23,12 +24,12 @@ #include <sys/wait.h> #include <unistd.h> -#include "affinity.hh" -#include "finally.hh" -#include "glog/logging.h" -#include "lazy.hh" -#include "serialise.hh" -#include "sync.hh" +#include "libutil/affinity.hh" +#include "libutil/finally.hh" +#include "libutil/lazy.hh" +#include "libutil/serialise.hh" +#include "libutil/sync.hh" +#include "nix_config.h" namespace nix { diff --git a/third_party/nix/src/libutil/util.hh b/third_party/nix/src/libutil/util.hh index 27e6b47fb2..b308c428fd 100644 --- a/third_party/nix/src/libutil/util.hh +++ b/third_party/nix/src/libutil/util.hh @@ -15,7 +15,7 @@ #include <sys/types.h> #include <unistd.h> -#include "types.hh" +#include "libutil/types.hh" #ifndef HAVE_STRUCT_DIRENT_D_TYPE #define DT_UNKNOWN 0 diff --git a/third_party/nix/src/libutil/xml-writer.cc b/third_party/nix/src/libutil/xml-writer.cc index d34e9a2f0d..8274ed769e 100644 --- a/third_party/nix/src/libutil/xml-writer.cc +++ b/third_party/nix/src/libutil/xml-writer.cc @@ -1,4 +1,4 @@ -#include "xml-writer.hh" +#include "libutil/xml-writer.hh" #include <cassert> |