diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-09 19:07:06 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-09 19:07:06 +0000 |
| commit | 323d51a7a05d81c717d8e8673a78b07500a591fe (patch) | |
| tree | 7f211f4b87ac11e129b865cd4d187608df1f7a1f /src/libutil | |
| parent | 0f05a36e205a1d04a0ed6d6cdcd0e3e225f73f05 (diff) | |
| parent | a2c27022e9afc394e08d34d349587c8903fc1a97 (diff) | |
Merge branch 'master' of github.com:NixOS/nix into better-ca-parse-errors
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/error.hh | 6 | ||||
| -rw-r--r-- | src/libutil/logging.cc | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libutil/error.hh b/src/libutil/error.hh index 1b0fb43b8..f4b3f11bb 100644 --- a/src/libutil/error.hh +++ b/src/libutil/error.hh @@ -1,8 +1,8 @@ #pragma once - #include "ref.hh" #include "types.hh" +#include "fmt.hh" #include <cstring> #include <list> @@ -10,7 +10,9 @@ #include <map> #include <optional> -#include "fmt.hh" +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> /* 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/src/libutil/logging.cc b/src/libutil/logging.cc index 90c6afe81..832aee783 100644 --- a/src/libutil/logging.cc +++ b/src/libutil/logging.cc @@ -81,7 +81,6 @@ public: log(ei.level, oss.str()); } - void startActivity(ActivityId act, Verbosity lvl, ActivityType type, const std::string & s, const Fields & fields, ActivityId parent) |