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

C++20: fix warnings reported by g++ 10.1

Browse source 
* spot/tl/formula.hh (formula::operator bool): Mark as noexcept.
* bin/common_trans.hh, bin/common_trans.cc: Use std::atomic instead of
volatile.
This commit is contained in:
Alexandre Duret-Lutz 2020-07-16 16:45:28 +02:00
parent a7ff5b4eed
commit 368acaad28
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bin/common_trans.cc
View file

@ -1,5 +1,5 @@
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2015-2019 Laboratoire de Recherche et Développement // Copyright (C) 2015-2020 Laboratoire de Recherche et Développement
// de l'Epita (LRDE). // de l'Epita (LRDE).
// //
// This file is part of Spot, a model checking library. // This file is part of Spot, a model checking library.
@ -457,12 +457,12 @@ autproc_runner::round_automaton(spot::const_twa_graph_ptr aut, unsigned serial)
filename_automaton.new_round(aut, serial); filename_automaton.new_round(aut, serial);
} }
volatile bool timed_out = false; std::atomic<bool> timed_out = false;
unsigned timeout_count = 0; unsigned timeout_count = 0;
static unsigned timeout = 0; static unsigned timeout = 0;
#if ENABLE_TIMEOUT #if ENABLE_TIMEOUT
static volatile int alarm_on = 0; static std::atomic<int> alarm_on = 0;
static int child_pid = -1; static int child_pid = -1;
static void static void

7
bin/common_trans.hh
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*- // -*- coding: utf-8 -*-
// Copyright (C) 2015-2018 Laboratoire de Recherche et Développement // Copyright (C) 2015-2018, 2020 Laboratoire de Recherche et
// 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.
// //
@ -21,6 +21,7 @@
#include "common_sys.hh" #include "common_sys.hh"
#include <vector> #include <vector>
#include <atomic>
#include <argp.h> #include <argp.h>
#include <spot/misc/formater.hh> #include <spot/misc/formater.hh>
@ -165,7 +166,7 @@ public:
# define ENABLE_TIMEOUT 0 # define ENABLE_TIMEOUT 0
#endif #endif
extern volatile bool timed_out; extern std::atomic<bool> timed_out;
extern unsigned timeout_count; extern unsigned timeout_count;
#if ENABLE_TIMEOUT #if ENABLE_TIMEOUT
void setup_sig_handler(); void setup_sig_handler();

2
spot/tl/formula.hh
View file

@ -842,7 +842,7 @@ namespace spot
return ptr_ != nullptr; return ptr_ != nullptr;
} }
operator bool() const operator bool() const noexcept
{ {
return ptr_ != nullptr; return ptr_ != nullptr;
} }