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

bricks: update and move to c++14

Browse source 
* Makefile.am, bricks/brick-assert,
bricks/brick-assert.h, spot/ltsmin/ltsmin.cc,
spot/mc/ec.hh: here.

* bricks/brick-bitlevel.h, bricks/brick-hash.h,
bricks/brick-hashset.h, bricks/brick-shmem.h,
bricks/brick-types.h: Rename as ...
* bricks/brick-bitlevel, bricks/brick-hash,
bricks/brick-hashset, bricks/brick-shmem,
bricks/brick-types: ... these
This commit is contained in:
Etienne Renault 2016-12-01 18:56:33 +01:00
parent 9208726d97
commit bb9fa4e910
10 changed files with 1557 additions and 1110 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spot/ltsmin/ltsmin.cc
View file

@ -43,8 +43,8 @@
#include <spot/twacube/cube.hh>
#include <spot/mc/utils.hh>
#include <spot/mc/ec.hh>
#include <bricks/brick-hashset.h>
#include <bricks/brick-hash.h>
#include <bricks/brick-hashset>
#include <bricks/brick-hash>
#include <spot/twaalgos/dot.hh>
#include <spot/twa/twaproduct.hh>
#include <spot/twaalgos/emptiness.hh>
@ -1285,7 +1285,7 @@ namespace spot
cspins_state s =
inner->manager->alloc_setup(dst, inner->compressed_,
inner->manager->size() * 2);
auto it = inner->map->insert({s});
auto it = inner->map->insert(s);
inner->succ->push_back(*it);
if (!it.isnew())
inner->manager->dealloc(s);
@ -1335,7 +1335,7 @@ namespace spot
cspins_state s =
inner->manager->alloc_setup(dst, inner->compressed_,
inner->manager->size() * 2);
auto it = inner->map->insert({s});
auto it = inner->map->insert(s);
inner->succ->push_back(*it);
if (!it.isnew())
inner->manager->dealloc(s);
@ -1421,7 +1421,7 @@ namespace spot
compress_(compress), cubeset_(visible_aps.size()),
selfloopize_(selfloopize), aps_(visible_aps), nb_threads_(nb_threads)
{
map_.setSize(2000000);
map_.initialSize(2000000);
manager_ = static_cast<cspins_state_manager*>
(::operator new(sizeof(cspins_state_manager) * nb_threads));
inner_ = new inner_callback_parameters[nb_threads_];

2
spot/mc/ec.hh
View file

@ -185,7 +185,7 @@ namespace spot
// -example and flush the bfs queue.
auto mark = this->twa_->trans_data(front->it_prop,
this->tid_).acc_;
if (!acc.has(mark))
if (!acc.has(mark.id))
{
ctrx_element* current = front;
while (current != nullptr)