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

Move config file loading into config.cc.

Browse Source
This commit is contained in:
dg
2023-05-11 19:58:16 +00:00
parent 9e383575d1
commit 715c0a0c42
10 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/fluxsource/fl2fluxsource.cc
View File

@@ -37,9 +37,9 @@ public:
{
_proto = loadFl2File(_config.filename());
DriveProto d = _proto.drive();
d.MergeFrom(globalConfig()->drive());
*(globalConfig()->mutable_drive()) = d;
DriveProto d = _proto.drive();
d.MergeFrom(globalConfig()->drive());
*(globalConfig()->mutable_drive()) = d;
}
public: