alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

c++11: get rid of spot::unique_ptr

Browse source 
But do not replace it by std::unique_ptr, because this was not
really equivalent.

* src/misc/unique_ptr.hh: Delete.
* src/misc/Makefile.am: Adjust.
* src/tgbaalgos/simulation.cc, src/tgbatest/ltl2tgba.cc: Call
delete explicitly.
This commit is contained in:
Alexandre Duret-Lutz 2013-12-18 16:25:16 +01:00
parent cdd7b475b3
commit 67b9e8d882
4 changed files with 20 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/tgbaalgos/simulation.cc
View file

@ -26,7 +26,6 @@
#include "simulation.hh"
#include "priv/acccompl.hh"
#include "misc/minato.hh"
#include "misc/unique_ptr.hh"
#include "tgba/bddprint.hh"
#include "tgbaalgos/reachiter.hh"
#include "tgbaalgos/sccfilter.hh"
@ -1599,25 +1598,28 @@ namespace spot
{
prev = next;
direct_simulation<false, Sba> simul(res);
tgba* maybe_res = simul.run();
tgba* after_simulation = simul.run();
if (res != t)
delete res;
if (simul.result_is_deterministic())
{
res = maybe_res;
res = after_simulation;
break;
}
unique_ptr<tgba> after_simulation(maybe_res);
direct_simulation<true, Sba> cosimul(after_simulation);
unique_ptr<tgba> after_cosimulation(cosimul.run());
tgba* after_cosimulation = cosimul.run();
next = cosimul.get_stat();
delete after_simulation;
if (Sba)
res = scc_filter_states(after_cosimulation);
else
res = scc_filter(after_cosimulation, false);
delete after_cosimulation;
}
while (prev != next);
return res;
@ -1663,15 +1665,18 @@ namespace spot
{
prev = next;
unique_ptr<tgba> after_simulation(dont_care_simulation(res, limit));
tgba* after_simulation = dont_care_simulation(res, limit);
if (res != t)
delete res;
direct_simulation<true, false> cosimul(after_simulation);
unique_ptr<tgba> after_cosimulation(cosimul.run());
tgba* after_cosimulation = cosimul.run();
delete after_simulation;
next = cosimul.get_stat();
res = scc_filter(after_cosimulation, true);
delete after_cosimulation;
}
while (prev != next);