Commitf92b41a

committed

Use cmath and std::isnan instead of C's isnan macro

1 parent883c216 commitf92b41aCopy full SHA for f92b41a

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include"../inst/include/Agent.h"`
`2`	`2`	`#include"../inst/include/Simulation.h"`
`3`		`-#include<math.h>`
	`3`	`+#include<cmath>`
`4`	`4`
`5`	`5`	`usingnamespaceRcpp;`
`6`	`6`
`@@ -91,7 +91,7 @@ XP<Agent> newAgent(Nullable<List> state, NumericVector death_time = NA_REAL)`
`91`	`91`	`{`
`92`	`92`	`XP<Agent> a = (std::make_shared<Agent>(state));`
`93`	`93`	`double d = as<double>(death_time);`
`94`		`-if (!isnan(d)) a->setDeathTime(d);`
	`94`	`+if (!std::isnan(d)) a->setDeathTime(d);`
`95`	`95`	`return a;`
`96`	`96`	`}`
`97`	`97`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#include"../inst/include/Simulation.h"`
`2`		`-#include<math.h>`
	`2`	`+#include<cmath>`
`3`	`3`
`4`	`4`	`usingnamespaceRcpp;`
`5`	`5`
`@@ -60,7 +60,7 @@ List Simulation::resume(const NumericVector &time)`
`60`	`60`
`61`	`61`	`voidSimulation::stateChanged(Agent &agent,const State &from)`
`62`	`62`	`{`
`63`		`-if (!isnan(_current_time)) {`
	`63`	`+if (!std::isnan(_current_time)) {`
`64`	`64`	`for (auto c : _loggers)`
`65`	`65`	`c->log(agent, from);`
`66`	`66`	`for (auto r : _rules) {`

Comments

(0)