Skip to content

Commit

Permalink
[clib] Switch ctrpath to SharedCabinet
Browse files Browse the repository at this point in the history
  • Loading branch information
ischoegl authored and speth committed Jun 21, 2023
1 parent b6fd178 commit ac7b3cb
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/clib/ctrpath.cpp
Expand Up @@ -16,8 +16,8 @@
using namespace Cantera;
using namespace std;

typedef Cabinet<ReactionPathBuilder> BuilderCabinet;
typedef Cabinet<ReactionPathDiagram> DiagramCabinet;
typedef SharedCabinet<ReactionPathBuilder> BuilderCabinet;
typedef SharedCabinet<ReactionPathDiagram> DiagramCabinet;
template<> DiagramCabinet* DiagramCabinet::s_storage = 0;
template<> BuilderCabinet* BuilderCabinet::s_storage = 0;

Expand All @@ -29,8 +29,7 @@ extern "C" {
int rdiag_new()
{
try {
ReactionPathDiagram* d = new ReactionPathDiagram();
return DiagramCabinet::add(d);
return DiagramCabinet::add(make_shared<ReactionPathDiagram>());
} catch (...) {
return handleAllExceptions(-1, ERR);
}
Expand Down Expand Up @@ -249,8 +248,7 @@ extern "C" {
int rbuild_new()
{
try {
ReactionPathBuilder* d = new ReactionPathBuilder();
return BuilderCabinet::add(d);
return BuilderCabinet::add(make_shared<ReactionPathBuilder>());
} catch (...) {
return handleAllExceptions(-1, ERR);
}
Expand Down

0 comments on commit ac7b3cb

Please sign in to comment.