fix compile errors

This commit is contained in:
Ben Burdette 2020-05-14 12:28:18 -06:00
parent 4daccb279c
commit 19694aa213
3 changed files with 19 additions and 15 deletions

View file

@ -3,6 +3,7 @@
#include <iostream> #include <iostream>
#include <optional> #include <optional>
#include "serialise.hh" #include "serialise.hh"
#include <sstream>
namespace nix { namespace nix {
@ -16,6 +17,21 @@ BaseError & BaseError::addPrefix(const FormatOrString & fs)
return *this; return *this;
} }
const string& BaseError::calcWhat() const
{
if (what_.has_value())
return *what_;
else {
err.name = sname();
std::ostringstream oss;
oss << err;
what_ = oss.str();
return *what_;
}
}
std::optional<string> ErrorInfo::programName = std::nullopt; std::optional<string> ErrorInfo::programName = std::nullopt;
std::ostream& operator<<(std::ostream &os, const hintformat &hf) std::ostream& operator<<(std::ostream &os, const hintformat &hf)

View file

@ -88,20 +88,8 @@ protected:
mutable ErrorInfo err; mutable ErrorInfo err;
mutable std::optional<string> what_; mutable std::optional<string> what_;
const string& calcWhat() const const string& calcWhat() const;
{
if (what_.has_value())
return *what_;
else {
err.name = sname();
std::ostringstream oss;
oss << err;
what_ = oss.str();
return *what_;
}
}
public: public:
unsigned int status = 1; // exit status unsigned int status = 1; // exit status

View file

@ -6,7 +6,7 @@
#include <list> #include <list>
#include <set> #include <set>
#include <map> #include <map>
#include <vector>
namespace nix { namespace nix {