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

robin_hood: Update to version 3.11.3

Browse source 
The only difference with upstream is that we keep std::malloc() as
malloc() to avoid issues with gnulib that sometimes redefine malloc to
rpl_malloc with a macro without defining std::rpl_malloc.

* spot/priv/robin_hood.hh, debian/copyright: Update.
* spot/priv/Makefile.am (update): Rename std::malloc to malloc.
This commit is contained in:
Alexandre Duret-Lutz 2021-09-15 22:05:28 +02:00
parent 42ff02585b
commit 830f68b3b9
3 changed files with 956 additions and 482 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/copyright vendored
View file

@ -201,7 +201,7 @@ License: Expat
IN THE SOFTWARE. IN THE SOFTWARE.
Files: spot/priv/robin_hood.hh Files: spot/priv/robin_hood.hh
Copyright: 2018-2019 Martin Ankerl Copyright: 2018-2021 Martin Ankerl
License: Expat License: Expat
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

9
spot/priv/Makefile.am
View file

@ -1,6 +1,6 @@
## -*- coding: utf-8 -*- ## -*- coding: utf-8 -*-
## Copyright (C) 2013-2019 Laboratoire de Recherche et Développement ## Copyright (C) 2013-2019, 2021 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.
## ##
@ -41,5 +41,6 @@ GH = https://raw.githubusercontent.com/martinus
RH = $(GH)/robin-hood-hashing/master/src/include/robin_hood.h RH = $(GH)/robin-hood-hashing/master/src/include/robin_hood.h
.PHONY: update .PHONY: update
update: update:
wget $(RH) -O $(srcdir)/robin_hood.hh || \ wget $(RH) -O robin_hood.tmp || curl $(RH) -o robin_hood.tmp
curl $(RH) -o $(srcdir)/robin_hood.hh sed 's/std::malloc/malloc/' robin_hood.tmp > $(srcdir)/robin_hood.hh
rm -f robin_hood.tmp

1427
spot/priv/robin_hood.hh
View file

File diff suppressed because it is too large Load diff