philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

add has_value check; remove obslete friend class

Browse source
This commit is contained in:
Ben Burdette 2020-04-24 12:44:23 -06:00
parent 833501f6f1
commit d9632765a8
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/error.cc
View file

@ -162,7 +162,7 @@ std::ostream& operator<<(std::ostream &out, const ErrorInfo &einfo)
out << prefix << std::endl; out << prefix << std::endl;
// lines of code. // lines of code.
if (einfo.nixCode->errLineOfCode != "") { if (einfo.nixCode.has_value() && einfo.nixCode->errLineOfCode != "") {
printCodeLines(prefix, *einfo.nixCode); printCodeLines(prefix, *einfo.nixCode);
out << prefix << std::endl; out << prefix << std::endl;
} }

5
src/libutil/fmt.hh
View file

@ -92,9 +92,11 @@ public:
{ {
fmt.exceptions(boost::io::all_error_bits ^ boost::io::too_many_args_bit); fmt.exceptions(boost::io::all_error_bits ^ boost::io::too_many_args_bit);
} }
hintformat(const hintformat &hf) hintformat(const hintformat &hf)
: fmt(hf.fmt) : fmt(hf.fmt)
{} {}
template<class T> template<class T>
hintformat& operator%(const T &value) hintformat& operator%(const T &value)
{ {
@ -102,14 +104,11 @@ public:
return *this; return *this;
} }
std::string str() const std::string str() const
{ {
return fmt.str(); return fmt.str();
} }
template <typename U>
friend class AddHint;
private: private:
format fmt; format fmt;
}; };

9
src/libutil/logging.hh
View file

@ -62,11 +62,12 @@ public:
virtual void logEI(const ErrorInfo &ei) = 0; virtual void logEI(const ErrorInfo &ei) = 0;
void logEI(Verbosity lvl, ErrorInfo ei) { void logEI(Verbosity lvl, ErrorInfo ei)
ei.level = lvl; {
logEI(ei); ei.level = lvl;
logEI(ei);
} }
virtual void warn(const std::string & msg); virtual void warn(const std::string & msg);
virtual void startActivity(ActivityId act, Verbosity lvl, ActivityType type, virtual void startActivity(ActivityId act, Verbosity lvl, ActivityType type,