Commit adb99869 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

bitvect: tweak to please icc

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.
parent 7c7f0df8
// -*- 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 ...@@ -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 ...@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment