ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

frozen: upgrade to 1.2.0

Browse Source 
* external/frozen/defines_h_constexpr_string.patch.0 is no longer
  necessary

Downloaded from
https://codeload.github.com/serge-sans-paille/frozen/tar.gz/refs/tags/1.2.0

Change-Id: Ie0b8488461860b1aaad3d18d0e76a619aa876c67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172654
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2024-08-30 20:09:18 +02:00
parent 7c2d17141c
commit ce20d92a2c
6 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -307,8 +307,8 @@ FREETYPE_TARBALL := freetype-2.13.3.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
FROZEN_SHA256SUM := f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45
FROZEN_TARBALL := frozen-1.1.1.tar.gz
FROZEN_SHA256SUM := ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823
FROZEN_TARBALL := frozen-1.2.0.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
external/frozen/UnpackedTarball_frozen.mk
Vendored
-1
View File
@@ -12,7 +12,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,frozen))
$(eval $(call gb_UnpackedTarball_set_tarball,frozen,$(FROZEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,frozen,\
external/frozen/defines_h_constexpr_string.patch.0 \
external/frozen/cid1532449_use_move_ctor.0 \
external/frozen/cid1586676_use_move_ctor.0 \
external/frozen/cid1538304_reference_ctor.0 \
external/frozen/cid1532449_use_move_ctor.0
Vendored
+2 -2
View File
@@ -7,7 +7,7 @@
- constexpr unordered_map(container_type items,
+ constexpr unordered_map(container_type&& items,
+ Hash const &hash, KeyEqual const &equal)
+ : equal_{equal}
+ : KeyEqual{equal}
+ , items_(std::move(items))
+ , tables_{
+ bits::make_pmh_tables<storage_size>(
@@ -17,7 +17,7 @@
+
+ constexpr unordered_map(const container_type& items,
Hash const &hash, KeyEqual const &equal)
: equal_{equal}
: KeyEqual{equal}
, items_{items}
, tables_{
bits::make_pmh_tables<storage_size>(
external/frozen/cid1538304_reference_ctor.0
Vendored
+5 -5
View File
@@ -1,13 +1,13 @@
--- include/frozen/map.h 2023-07-22 20:20:19.580400347 +0100
+++ include/frozen/map.h 2023-07-22 20:25:44.893704485 +0100
@@ -94,11 +94,11 @@
@@ -96,11 +96,11 @@
public:
/* constructors */
- constexpr map(container_type items, Compare const &compare)
+ constexpr map(const container_type& items, Compare const &compare)
: less_than_{compare}
, items_{bits::quicksort(items, less_than_)} {}
: impl::CompareKey<Compare>{compare}
, items_{bits::quicksort(bits::remove_cv_t<container_type>(items), value_comp())} {}
- explicit constexpr map(container_type items)
+ explicit constexpr map(const container_type& items)
@@ -22,8 +22,8 @@
- constexpr set(container_type keys, Compare const & comp)
+ constexpr set(const container_type& keys, Compare const & comp)
: less_than_{comp}
, keys_(bits::quicksort(keys, less_than_)) {
: Compare{comp}
, keys_(bits::quicksort(keys, value_comp())) {
}
- explicit constexpr set(container_type keys)
external/frozen/cid1586676_use_move_ctor.0
Vendored
+3 -3
View File
@@ -1,19 +1,19 @@
--- include/frozen/unordered_set.h 2024-01-22 10:42:57.125966099 +0000
+++ include/frozen/unordered_set.h 2024-01-22 10:46:07.701159961 +0000
@@ -74,13 +74,19 @@
@@ -73,13 +73,19 @@
public:
/* constructors */
unordered_set(unordered_set const &) = default;
- constexpr unordered_set(container_type keys, Hash const &hash,
+ constexpr unordered_set(container_type&& keys, Hash const &hash,
+ KeyEqual const &equal)
+ : equal_{equal}
+ : KeyEqual{equal}
+ , keys_{std::move(keys)}
+ , tables_{bits::make_pmh_tables<storage_size>(
+ keys_, hash, bits::Get{}, default_prg_t{})} {}
+ constexpr unordered_set(const container_type& keys, Hash const &hash,
KeyEqual const &equal)
: equal_{equal}
: KeyEqual{equal}
, keys_{keys}
, tables_{bits::make_pmh_tables<storage_size>(
keys_, hash, bits::Get{}, default_prg_t{})} {}
external/frozen/defines_h_constexpr_string.patch.0
Vendored
-11
View File
@@ -1,11 +0,0 @@
--- include/frozen/bits/defines.h
+++ include/frozen/bits/defines.h
@@ -59,7 +59,7 @@
#define FROZEN_LETITGO_HAS_DEDUCTION_GUIDES
#endif
-#if __cpp_lib_constexpr_string >= 201907L
+#if defined(__cpp_lib_constexpr_string) && __cpp_lib_constexpr_string >= 201907L
#define FROZEN_LETITGO_HAS_CONSTEXPR_STRING
#endif