nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-26 16:52:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove using std::*, switch to include guard

Browse Source
This commit is contained in:
Ben Burdette 2020-04-01 15:51:14 -06:00
parent a72b6b2ec8
commit 8713aeac5e
3 changed files with 78 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libutil/error.cc
View File

@ -5,11 +5,7 @@
namespace nix { namespace nix {
using std::cout; optional<string> ErrorInfo::programName = std::nullopt;
using std::endl;
using std::nullopt;
optional<string> ErrorInfo::programName = nullopt;
// return basic_format? // return basic_format?
string showErrLine(ErrLine &errLine) string showErrLine(ErrLine &errLine)

14
src/libutil/error.hh
View File

@ -1,4 +1,5 @@
#pragma once #ifndef error_hh
#define error_hh
#include "ansicolor.hh" #include "ansicolor.hh"
#include <string> #include <string>
@ -8,12 +9,6 @@
#include <boost/format.hpp> #include <boost/format.hpp>
using std::string;
using std::optional;
using boost::format;
using std::cout;
using std::endl;
namespace nix { namespace nix {
typedef enum typedef enum
@ -36,7 +31,6 @@ class ErrLine {
optional<string> prevLineOfCode; optional<string> prevLineOfCode;
string errLineOfCode; string errLineOfCode;
optional<string> nextLineOfCode; optional<string> nextLineOfCode;
}; };
class NixCode { class NixCode {
@ -112,8 +106,6 @@ class ErrorInfo {
protected: protected:
// constructor is protected, so only the builder classes can create an ErrorInfo. // constructor is protected, so only the builder classes can create an ErrorInfo.
ErrorInfo(ErrLevel level) { this->level = level; } ErrorInfo(ErrLevel level) { this->level = level; }
}; };
// Init as error // Init as error
@ -285,7 +277,9 @@ typedef AddName<
// -------------------------------------------------------- // --------------------------------------------------------
// error printing // error printing
// just to cout for now.
void printErrorInfo(ErrorInfo &einfo); void printErrorInfo(ErrorInfo &einfo);
} }
#endif

8
tests/errors/main.cc
View File

@ -3,10 +3,6 @@
#include <optional> #include <optional>
#include <iostream> #include <iostream>
using std::optional;
using std::nullopt;
using std::cout;
using std::endl;
int main() int main()
@ -73,9 +69,9 @@ int main()
.nixFile("myfile.nix") .nixFile("myfile.nix")
.lineNumber(40) .lineNumber(40)
.columnRange(13,7) .columnRange(13,7)
.linesOfCode(nullopt .linesOfCode(std::nullopt
,"this is the problem line of code" ,"this is the problem line of code"
,nullopt) ,std::nullopt)
.hint(hintfmt("this hint has %1% templated %2%!!") % "yellow" % "values") .hint(hintfmt("this hint has %1% templated %2%!!") % "yellow" % "values")
); );