salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Change the global config variable to a globalConfig() function.

Browse Source
This commit is contained in:
dg
2023-05-10 22:07:17 +00:00
parent 24ff51274b
commit 9ba3f90f1e
43 changed files with 297 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/layout.cc
View File

@@ -19,8 +19,9 @@ static std::string cleanup(const std::string& s)
static void load_config(const std::string s)
{
config.Clear();
if (!google::protobuf::TextFormat::MergeFromString(cleanup(s), &config))
globalConfig().Clear();
if (!google::protobuf::TextFormat::MergeFromString(
cleanup(s), &globalConfig()))
error("couldn't load test config");
}