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

silence diagnostics from gcc-snapshot

Browse source 
(Upcoming GCC 6.)

* src/misc/intvcmp2.cc: Here.
* NEWS: Mention it.
This commit is contained in:
Alexandre Duret-Lutz 2015-08-17 18:54:49 +02:00
parent 56cbc3c813
commit 0689aa165b
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -34,6 +34,7 @@ New in spot 1.99.2a (not yet released)
but only when compiled in DEBUG mode. but only when compiled in DEBUG mode.
- LTL formula rewritten in Spin's syntax no longer have their -> - LTL formula rewritten in Spin's syntax no longer have their ->
and <-> rewritten aways. and <-> rewritten aways.
- Fix some warnings reported by the development version of GCC 6.
New in spot 1.99.2 (2015-07-18) New in spot 1.99.2 (2015-07-18)

12
src/misc/intvcmp2.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2011, 2013, 2014 Laboratoire de Recherche et // Copyright (C) 2011, 2013, 2014, 2015 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.
@ -259,7 +259,7 @@ namespace spot
break; break;
case 2: // 6 5-bit values case 2: // 6 5-bit values
{ {
unsigned int output = 0x02 << 30; // 10 unsigned int output = 0x02U << 30; // 10
output += self().data_at(0) << 25; output += self().data_at(0) << 25;
output += self().data_at(1) << 20; output += self().data_at(1) << 20;
output += self().data_at(2) << 15; output += self().data_at(2) << 15;
@ -271,7 +271,7 @@ namespace spot
break; break;
case 3: // 4 7-bit values case 3: // 4 7-bit values
{ {
unsigned int output = 0x0C << 28; // 1100 unsigned int output = 0x0CU << 28; // 1100
output += self().data_at(0) << 21; output += self().data_at(0) << 21;
output += self().data_at(1) << 14; output += self().data_at(1) << 14;
output += self().data_at(2) << 7; output += self().data_at(2) << 7;
@ -281,7 +281,7 @@ namespace spot
break; break;
case 4: // 3 9-bit values case 4: // 3 9-bit values
{ {
unsigned int output = 0x0D << 28; // 1101x (1 bit lost) unsigned int output = 0x0DU << 28; // 1101x (1 bit lost)
output += self().data_at(0) << 18; output += self().data_at(0) << 18;
output += self().data_at(1) << 9; output += self().data_at(1) << 9;
output += self().data_at(2); output += self().data_at(2);
@ -290,7 +290,7 @@ namespace spot
break; break;
case 5: // 2 14-bit values case 5: // 2 14-bit values
{ {
unsigned int output = 0x0E << 28; // 1110 unsigned int output = 0x0EU << 28; // 1110
output += self().data_at(0) << 14; output += self().data_at(0) << 14;
output += self().data_at(1); output += self().data_at(1);
self().push_data(output); self().push_data(output);
@ -298,7 +298,7 @@ namespace spot
break; break;
case 6: // one 28-bit value case 6: // one 28-bit value
{ {
unsigned int output = 0x0F << 28; // 1111 unsigned int output = 0x0FU << 28; // 1111
output += self().data_at(0); output += self().data_at(0);
self().push_data(output); self().push_data(output);
} }