Skip to content

Commit

Permalink
Fixes for backwards compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
nathanwbrei committed Jul 2, 2024
1 parent be285f0 commit c1f3fde
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/libraries/JANA/Status/JComponentSummary.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void JComponentSummary::Add(JComponentSummary::Component* component) {
}

for (JComponentSummary::Collection* output : component->m_outputs) {
JComponentSummary::Factory fac;
JFactorySummary fac;
fac.level = output->GetLevel();
fac.plugin_name = component->GetPluginName();
fac.factory_name = component->GetTypeName();
Expand Down
19 changes: 10 additions & 9 deletions src/libraries/JANA/Status/JComponentSummary.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@
#include <memory>


// Keeping this around for backwards compatibility only
struct JFactorySummary {
JEventLevel level;
std::string plugin_name;
std::string factory_name;
std::string factory_tag;
std::string object_name;
};


class JComponentSummary {
public:
Expand Down Expand Up @@ -145,15 +154,7 @@ class JComponentSummary {

public:
// Kept for backwards compatibility
struct Factory {
JEventLevel level;
std::string plugin_name;
std::string factory_name;
std::string factory_tag;
std::string object_name;
};

std::vector<Factory> factories;
std::vector<JFactorySummary> factories;
};

std::ostream& operator<<(std::ostream& os, const JComponentSummary& cs);
Expand Down

0 comments on commit c1f3fde

Please sign in to comment.