Remove static variable name clashes

This was useful for an experiment with building Nix as a single compilation unit. It's not very useful otherwise but also doesn't hurt...
2020-10-06 13:49:20 +02:00
parent 0419cd2695
commit 85c8be6286
63 changed files with 97 additions and 92 deletions
@@ -2081,7 +2081,7 @@ Strings EvalSettings::getDefaultNixPath()

 EvalSettings evalSettings;

-static GlobalConfig::Register r1(&evalSettings);
+static GlobalConfig::Register rEvalSettings(&evalSettings);


 }