Skip to content

Commit

Permalink
Merge pull request #326 from sbmlteam/small-fixes
Browse files Browse the repository at this point in the history
Various small fixes
  • Loading branch information
skeating committed May 25, 2023
2 parents 5e188fe + c0fb352 commit b53ac85
Show file tree
Hide file tree
Showing 32 changed files with 189 additions and 162 deletions.
4 changes: 2 additions & 2 deletions src/sbml/AlgebraicRule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ AlgebraicRule_create(unsigned int level, unsigned int version)
AlgebraicRule* obj = new AlgebraicRule(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -387,7 +387,7 @@ AlgebraicRule_createWithNS (SBMLNamespaces_t* sbmlns)
AlgebraicRule* obj = new AlgebraicRule(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions src/sbml/AssignmentRule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ AssignmentRule_create(unsigned int level, unsigned int version)
AssignmentRule* obj = new AssignmentRule(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -466,7 +466,7 @@ AssignmentRule_createWithNS (SBMLNamespaces_t* sbmlns)
AssignmentRule* obj = new AssignmentRule(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions src/sbml/Compartment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1999,7 +1999,7 @@ ListOfCompartments::createObject (XMLInputStream& stream)
{
object = new Compartment(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
object = new Compartment(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -2029,7 +2029,7 @@ Compartment_create (unsigned int level, unsigned int version)
Compartment* obj = new Compartment(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -2045,7 +2045,7 @@ Compartment_createWithNS (SBMLNamespaces_t* sbmlns)
Compartment* obj = new Compartment(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions src/sbml/CompartmentType.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ ListOfCompartmentTypes::createObject (XMLInputStream& stream)
{
object = new CompartmentType(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
// compartment type does not exist in L3
object = new CompartmentType(2,4);
Expand Down Expand Up @@ -837,7 +837,7 @@ CompartmentType_create (unsigned int level, unsigned int version)
CompartmentType* obj = new CompartmentType(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -853,7 +853,7 @@ CompartmentType_createWithNS (SBMLNamespaces_t* sbmlns)
CompartmentType* obj = new CompartmentType(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions src/sbml/Constraint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ ListOfConstraints::createObject (XMLInputStream& stream)
{
object = new Constraint(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
object = new Constraint(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -1107,7 +1107,7 @@ Constraint_create (unsigned int level, unsigned int version)
Constraint* obj = new Constraint(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -1123,7 +1123,7 @@ Constraint_createWithNS (SBMLNamespaces_t* sbmlns)
Constraint* obj = new Constraint(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions src/sbml/Delay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,7 @@ Delay_create (unsigned int level, unsigned int version)
Delay* obj = new Delay(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -872,7 +872,7 @@ Delay_createWithNS (SBMLNamespaces_t* sbmlns)
Delay* obj = new Delay(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
12 changes: 6 additions & 6 deletions src/sbml/Event.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1281,7 +1281,7 @@ Event::createObject (XMLInputStream& stream)
{
mTrigger = new Trigger(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
mTrigger = new Trigger(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -1310,7 +1310,7 @@ Event::createObject (XMLInputStream& stream)
{
mDelay = new Delay(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
mDelay = new Delay(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -1341,7 +1341,7 @@ Event::createObject (XMLInputStream& stream)
{
mPriority = new Priority(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
mPriority = new Priority(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -2293,7 +2293,7 @@ ListOfEvents::createObject (XMLInputStream& stream)
{
object = new Event(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
object = new Event(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -2324,7 +2324,7 @@ Event_create (unsigned int level, unsigned int version)
Event* obj = new Event(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -2340,7 +2340,7 @@ Event_createWithNS (SBMLNamespaces_t* sbmlns)
Event* obj = new Event(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions src/sbml/EventAssignment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,7 @@ ListOfEventAssignments::createObject (XMLInputStream& stream)
{
object = new EventAssignment(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
object = new EventAssignment(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -1243,7 +1243,7 @@ EventAssignment_create (unsigned int level, unsigned int version)
EventAssignment* obj = new EventAssignment(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -1259,7 +1259,7 @@ EventAssignment_createWithNS (SBMLNamespaces_t* sbmlns)
EventAssignment* obj = new EventAssignment(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions src/sbml/FunctionDefinition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@ ListOfFunctionDefinitions::createObject (XMLInputStream& stream)
{
object = new FunctionDefinition(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
object = new FunctionDefinition(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -1322,7 +1322,7 @@ FunctionDefinition_create (unsigned int level, unsigned int version)
FunctionDefinition* obj = new FunctionDefinition(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -1338,7 +1338,7 @@ FunctionDefinition_createWithNS (SBMLNamespaces_t* sbmlns)
FunctionDefinition* obj = new FunctionDefinition(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions src/sbml/InitialAssignment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ ListOfInitialAssignments::createObject (XMLInputStream& stream)
{
object = new InitialAssignment(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
object = new InitialAssignment(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -1225,7 +1225,7 @@ InitialAssignment_create (unsigned int level, unsigned int version)
InitialAssignment* obj = new InitialAssignment(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -1241,7 +1241,7 @@ InitialAssignment_createWithNS (SBMLNamespaces_t* sbmlns)
InitialAssignment* obj = new InitialAssignment(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions src/sbml/KineticLaw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,7 @@ KineticLaw_create (unsigned int level, unsigned int version)
KineticLaw* obj = new KineticLaw(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -2023,7 +2023,7 @@ KineticLaw_createWithNS (SBMLNamespaces_t* sbmlns)
KineticLaw* obj = new KineticLaw(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions src/sbml/LocalParameter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ ListOfLocalParameters::createObject (XMLInputStream& stream)
{
object = new LocalParameter(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
object = new LocalParameter(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -782,7 +782,7 @@ LocalParameter_create (unsigned int level, unsigned int version)
LocalParameter* obj = new LocalParameter(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -798,7 +798,7 @@ LocalParameter_createWithNS (SBMLNamespaces_t* sbmlns)
LocalParameter* obj = new LocalParameter(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions src/sbml/Model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7104,7 +7104,7 @@ Model_create (unsigned int level, unsigned int version)
Model* obj = new Model(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -7120,7 +7120,7 @@ Model_createWithNS (SBMLNamespaces_t* sbmlns)
Model* obj = new Model(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions src/sbml/ModifierSpeciesReference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ ModifierSpeciesReference_create(unsigned int level, unsigned int version)
ModifierSpeciesReference* obj = new ModifierSpeciesReference(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -413,7 +413,7 @@ ModifierSpeciesReference_createWithNS (SBMLNamespaces_t* sbmlns)
ModifierSpeciesReference* obj = new ModifierSpeciesReference(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions src/sbml/Parameter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1918,7 +1918,7 @@ ListOfParameters::createObject (XMLInputStream& stream)
{
object = new Parameter(getSBMLNamespaces());
}
catch (SBMLConstructorException*)
catch (SBMLConstructorException &)
{
object = new Parameter(SBMLDocument::getDefaultLevel(),
SBMLDocument::getDefaultVersion());
Expand Down Expand Up @@ -1948,7 +1948,7 @@ Parameter_create (unsigned int level, unsigned int version)
Parameter* obj = new Parameter(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -1964,7 +1964,7 @@ Parameter_createWithNS (SBMLNamespaces_t* sbmlns)
Parameter* obj = new Parameter(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
4 changes: 2 additions & 2 deletions src/sbml/Priority.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ Priority_create (unsigned int level, unsigned int version)
Priority* obj = new Priority(level,version);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand All @@ -719,7 +719,7 @@ Priority_createWithNS (SBMLNamespaces_t* sbmlns)
Priority* obj = new Priority(sbmlns);
return obj;
}
catch (SBMLConstructorException)
catch (SBMLConstructorException &)
{
return NULL;
}
Expand Down
Loading

0 comments on commit b53ac85

Please sign in to comment.