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

bitvect: tweak to please icc

Browse source 
This allows bitvect.hh to compile with icpc 16.0.2, but the whole
project does not yet compile due to a bug in 16.0.2 that prevents
compilation of unordered_map::emplace() from the STL shipped with GCC
5.3.1.

* spot/misc/bitvect.hh: adjust friend declarations.
This commit is contained in:
Alexandre Duret-Lutz 2016-04-20 19:41:47 +02:00
parent 7144efabb9
commit 2c68842a5a
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spot/misc/bitvect.hh
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2013, 2014, 2015 Laboratoire de Recherche et // Copyright (C) 2013, 2014, 2015, 2016 Laboratoire de Recherche et
// Développement de l'Epita (LRDE). // Développement de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -436,17 +436,15 @@ namespace spot
return res; return res;
} }
friend SPOT_API bitvect* friend SPOT_API bitvect* make_bitvect(size_t bitcount);
::spot::make_bitvect(size_t bitcount);
/// Print a bitvect. /// Print a bitvect.
friend SPOT_API std::ostream& operator<<(std::ostream&, friend SPOT_API std::ostream& operator<<(std::ostream&,
const bitvect&); const bitvect&);
private: private:
friend SPOT_API bitvect_array* friend SPOT_API bitvect_array* make_bitvect_array(size_t bitcount,
::spot::make_bitvect_array(size_t bitcount, size_t vectcount);
size_t vectcount);
size_t size_; size_t size_;
size_t block_count_; size_t block_count_;
@ -516,9 +514,8 @@ namespace spot
return *reinterpret_cast<const bitvect*>(storage() + index * bvsize_); return *reinterpret_cast<const bitvect*>(storage() + index * bvsize_);
} }
friend SPOT_API bitvect_array* friend SPOT_API bitvect_array* make_bitvect_array(size_t bitcount,
::spot::make_bitvect_array(size_t bitcount, size_t vectcount);
size_t vectcount);
/// Print a bitvect_array. /// Print a bitvect_array.