From 2c68842a5a7ebfd689029f05ee9aa07c69452af4 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 20 Apr 2016 19:41:47 +0200 Subject: [PATCH] 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. --- spot/misc/bitvect.hh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/spot/misc/bitvect.hh b/spot/misc/bitvect.hh index ac9175893..cdc4472d7 100644 --- a/spot/misc/bitvect.hh +++ b/spot/misc/bitvect.hh @@ -1,5 +1,5 @@ // -*- 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). // // This file is part of Spot, a model checking library. @@ -436,17 +436,15 @@ namespace spot return res; } - friend SPOT_API bitvect* - ::spot::make_bitvect(size_t bitcount); + friend SPOT_API bitvect* make_bitvect(size_t bitcount); /// Print a bitvect. friend SPOT_API std::ostream& operator<<(std::ostream&, const bitvect&); private: - friend SPOT_API bitvect_array* - ::spot::make_bitvect_array(size_t bitcount, - size_t vectcount); + friend SPOT_API bitvect_array* make_bitvect_array(size_t bitcount, + size_t vectcount); size_t size_; size_t block_count_; @@ -516,9 +514,8 @@ namespace spot return *reinterpret_cast(storage() + index * bvsize_); } - friend SPOT_API bitvect_array* - ::spot::make_bitvect_array(size_t bitcount, - size_t vectcount); + friend SPOT_API bitvect_array* make_bitvect_array(size_t bitcount, + size_t vectcount); /// Print a bitvect_array.