maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(3p/nix): Remove 'using std::*' from types.hh

Browse source 
It is considered bad form to use things from includes in headers, as
these directives propagate to everywhere else and can make it
confusing.

types.hh (which is includes almost literally everywhere) had some of
these directives, which this commit removes.
This commit is contained in:
Vincent Ambo 2020-05-24 22:29:21 +01:00
parent f30b2e610d
commit 838f86b0fd
85 changed files with 859 additions and 821 deletions
Download patch file Download diff file Expand all files Collapse all files

26
third_party/nix/src/nix-store/dotgraph.cc vendored
View file

@ -9,23 +9,23 @@ using std::cout;
namespace nix {
static string dotQuote(const string& s) { return "\"" + s + "\""; }
static std::string dotQuote(const std::string& s) { return "\"" + s + "\""; }
static string nextColour() {
static std::string nextColour() {
static int n = 0;
static string colours[] = {"black", "red", "green",
"blue", "magenta", "burlywood"};
return colours[n++ % (sizeof(colours) / sizeof(string))];
static std::string colours[] = {"black", "red", "green",
"blue", "magenta", "burlywood"};
return colours[n++ % (sizeof(colours) / sizeof(std::string))];
}
static string makeEdge(const string& src, const string& dst) {
static std::string makeEdge(const std::string& src, const std::string& dst) {
format f = format("%1% -> %2% [color = %3%];\n") % dotQuote(src) %
dotQuote(dst) % dotQuote(nextColour());
return f.str();
}
static string makeNode(const string& id, const string& label,
const string& colour) {
static std::string makeNode(const std::string& id, const std::string& label,
const std::string& colour) {
format f = format(
"%1% [label = %2%, shape = box, "
"style = filled, fillcolor = %3%];\n") %
@ -33,15 +33,15 @@ static string makeNode(const string& id, const string& label,
return f.str();
}
static string symbolicName(const string& path) {
string p = baseNameOf(path);
return string(p, p.find('-') + 1);
static std::string symbolicName(const std::string& path) {
std::string p = baseNameOf(path);
return std::string(p, p.find('-') + 1);
}
#if 0
string pathLabel(const Path & nePath, const string & elemPath)
std::string pathLabel(const Path & nePath, const std::string & elemPath)
{
return (string) nePath + "-" + elemPath;
return (std::string) nePath + "-" + elemPath;
}