From 3b00641d17b79ef4ed2c8617cf7fe9aa4fc0608e Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Mon, 9 Oct 2023 14:53:51 -0400 Subject: [PATCH] init_printjson: always create singleton --- src/printjson/init_printjson.cpp | 34 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/printjson/init_printjson.cpp b/src/printjson/init_printjson.cpp index 6bbaf01b..893ffaf3 100644 --- a/src/printjson/init_printjson.cpp +++ b/src/printjson/init_printjson.cpp @@ -4,29 +4,33 @@ */ #include "init_printjson.hpp" +#include "PrintJson.hpp" #include "xo/reflect/init_reflect.hpp" #include "xo/subsys/Subsystem.hpp" namespace xo { - void - InitSubsys::init() - { - /* placeholder -- expecting there to be non-trivial content soon */ - } /*init*/ + using xo::json::PrintJsonSingleton; - InitEvidence - InitSubsys::require() - { - InitEvidence retval; + void + InitSubsys::init() + { + /* create singleton */ + PrintJsonSingleton::instance(); + } /*init*/ - /* subsystem dependencies for printjson/ */ - retval ^= InitSubsys::require(); + InitEvidence + InitSubsys::require() + { + InitEvidence retval; - /* printjson/'s own initialization code */ - retval ^= Subsystem::provide("printjson", &init); + /* subsystem dependencies for printjson/ */ + retval ^= InitSubsys::require(); - return retval; - } /*require*/ + /* printjson/'s own initialization code */ + retval ^= Subsystem::provide("printjson", &init); + + return retval; + } /*require*/ } /*namespace xo*/ /* end init_printjson.cpp */