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

build: fix multiple Clang13 warnings

Browse source 
* spot/kripke/kripkegraph.hh, spot/misc/hash.hh, spot/twa/taatgba.cc,
  spot/twa/twagraph.hh, tests/core/ngraph.cc: Replace subtraction of
  pointeur minus nullptr by an explicit cast to size_t.
* spot/twa/acc.hh: Add explicit default copy assignment operator for
  rs_pair.
This commit is contained in:
Jérôme Dubois 2021-11-20 16:51:26 +01:00 • committed by Alexandre Duret-Lutz
parent 2a408bbed1
commit 81f146f648
6 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
spot/kripke/kripkegraph.hh
View file

@ -64,8 +64,7 @@ namespace spot
virtual size_t hash() const override virtual size_t hash() const override
{ {
return return reinterpret_cast<size_t>(this);
reinterpret_cast<const char*>(this) - static_cast<const char*>(nullptr);
} }
virtual kripke_graph_state* virtual kripke_graph_state*

3
spot/misc/hash.hh
View file

@ -48,8 +48,7 @@ namespace spot
size_t operator()(const T* p) const noexcept size_t operator()(const T* p) const noexcept
{ {
return knuth32_hash(reinterpret_cast<const char*>(p) return knuth32_hash(reinterpret_cast<size_t>(p));
- static_cast<const char*>(nullptr));
} }
}; };

1
spot/twa/acc.hh
View file

@ -1670,6 +1670,7 @@ namespace spot
#ifndef SWIG #ifndef SWIG
rs_pair() = default; rs_pair() = default;
rs_pair(const rs_pair&) = default; rs_pair(const rs_pair&) = default;
rs_pair& operator=(const rs_pair&) = default;
#endif #endif
rs_pair(acc_cond::mark_t fin, acc_cond::mark_t inf) noexcept: rs_pair(acc_cond::mark_t fin, acc_cond::mark_t inf) noexcept:

2
spot/twa/taatgba.cc
View file

@ -105,7 +105,7 @@ namespace spot
taa_tgba::state_set::const_iterator it = s_->begin(); taa_tgba::state_set::const_iterator it = s_->begin();
while (it != s_->end()) while (it != s_->end())
{ {
res ^= reinterpret_cast<const char*>(*it++) - static_cast<char*>(nullptr); res ^= reinterpret_cast<size_t>(*it++);
res = wang32_hash(res); res = wang32_hash(res);
} }
return res; return res;

3
spot/twa/twagraph.hh
View file

@ -70,8 +70,7 @@ namespace spot
virtual size_t hash() const override virtual size_t hash() const override
{ {
return return reinterpret_cast<size_t>(this);
reinterpret_cast<const char*>(this) - static_cast<const char*>(nullptr);
} }
virtual twa_graph_state* virtual twa_graph_state*

3
tests/core/ngraph.cc
View file

@ -372,8 +372,7 @@ public:
size_t hash() const override size_t hash() const override
{ {
return return reinterpret_cast<size_t>(this);
reinterpret_cast<const char*>(this) - static_cast<const char*>(nullptr);
} }
my_state* clone() const override my_state* clone() const override