From f0f1aef39d33408540a49d9c87a000bcb2d5fd4b Mon Sep 17 00:00:00 2001 From: TinyAtoms Date: Fri, 7 Feb 2020 15:57:40 -0300 Subject: [PATCH] fixed googlemap --- src/includes/3thparty/sparsehash/dense_hash_map | 6 +++--- .../3thparty/sparsehash/internal/densehashtable.h | 8 ++++---- .../3thparty/sparsehash/internal/hashtable-common.h | 2 +- .../sparsehash/internal/libc_allocator_with_realloc.h | 2 +- .../3thparty/sparsehash/internal/sparsehashtable.h | 8 ++++---- src/includes/3thparty/sparsehash/sparse_hash_map | 6 +++--- src/includes/3thparty/sparsehash/sparsetable | 8 ++++---- src/includes/3thparty/sparsehash/template_util.h | 2 +- src/includes/3thparty/sparsehash/type_traits.h | 4 ++-- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/includes/3thparty/sparsehash/dense_hash_map b/src/includes/3thparty/sparsehash/dense_hash_map index 05fd580..92b9746 100644 --- a/src/includes/3thparty/sparsehash/dense_hash_map +++ b/src/includes/3thparty/sparsehash/dense_hash_map @@ -96,13 +96,13 @@ #ifndef _DENSE_HASH_MAP_H_ #define _DENSE_HASH_MAP_H_ -#include +#include "./internal/sparseconfig.h" #include // needed by stl_alloc #include // for equal_to<>, select1st<>, etc #include // for alloc #include // for pair<> -#include // IWYU pragma: export -#include +#include "./internal/densehashtable.h" // IWYU pragma: export +#include "./internal/libc_allocator_with_realloc.h" #include HASH_FUN_H // for hash<> _START_GOOGLE_NAMESPACE_ diff --git a/src/includes/3thparty/sparsehash/internal/densehashtable.h b/src/includes/3thparty/sparsehash/internal/densehashtable.h index cdf4ff6..96f1cd0 100644 --- a/src/includes/3thparty/sparsehash/internal/densehashtable.h +++ b/src/includes/3thparty/sparsehash/internal/densehashtable.h @@ -89,7 +89,7 @@ #ifndef _DENSEHASHTABLE_H_ #define _DENSEHASHTABLE_H_ -#include +#include "./internal/sparseconfig.h" #include #include // for FILE, fwrite, fread #include // For swap(), eg @@ -97,9 +97,9 @@ #include // for numeric_limits #include // For uninitialized_fill #include // for pair -#include -#include -#include +#include "./internal/hashtable-common.h" +#include "./internal/libc_allocator_with_realloc.h" +#include "./type_traits.h" #include // For length_error _START_GOOGLE_NAMESPACE_ diff --git a/src/includes/3thparty/sparsehash/internal/hashtable-common.h b/src/includes/3thparty/sparsehash/internal/hashtable-common.h index bac2b88..e913eb7 100644 --- a/src/includes/3thparty/sparsehash/internal/hashtable-common.h +++ b/src/includes/3thparty/sparsehash/internal/hashtable-common.h @@ -40,7 +40,7 @@ #ifndef UTIL_GTL_HASHTABLE_COMMON_H_ #define UTIL_GTL_HASHTABLE_COMMON_H_ -#include +#include "./internal/sparseconfig.h" #include #include #include // for size_t diff --git a/src/includes/3thparty/sparsehash/internal/libc_allocator_with_realloc.h b/src/includes/3thparty/sparsehash/internal/libc_allocator_with_realloc.h index 769329f..22310f5 100644 --- a/src/includes/3thparty/sparsehash/internal/libc_allocator_with_realloc.h +++ b/src/includes/3thparty/sparsehash/internal/libc_allocator_with_realloc.h @@ -32,7 +32,7 @@ #ifndef UTIL_GTL_LIBC_ALLOCATOR_WITH_REALLOC_H_ #define UTIL_GTL_LIBC_ALLOCATOR_WITH_REALLOC_H_ -#include +#include "./internal/sparseconfig.h" #include // for malloc/realloc/free #include // for ptrdiff_t #include // for placement new diff --git a/src/includes/3thparty/sparsehash/internal/sparsehashtable.h b/src/includes/3thparty/sparsehash/internal/sparsehashtable.h index f54ea51..f1524fe 100644 --- a/src/includes/3thparty/sparsehash/internal/sparsehashtable.h +++ b/src/includes/3thparty/sparsehash/internal/sparsehashtable.h @@ -95,15 +95,15 @@ #ifndef _SPARSEHASHTABLE_H_ #define _SPARSEHASHTABLE_H_ -#include +#include "./internal/sparseconfig.h" #include #include // For swap(), eg #include // for iterator tags #include // for numeric_limits #include // for pair -#include // for remove_const -#include -#include // IWYU pragma: export +#include "./type_traits.h" // for remove_const +#include "./internal/hashtable-common.h" +#include "./sparsetable" // IWYU pragma: export #include // For length_error _START_GOOGLE_NAMESPACE_ diff --git a/src/includes/3thparty/sparsehash/sparse_hash_map b/src/includes/3thparty/sparsehash/sparse_hash_map index 1687a8b..a97a2b4 100644 --- a/src/includes/3thparty/sparsehash/sparse_hash_map +++ b/src/includes/3thparty/sparsehash/sparse_hash_map @@ -84,13 +84,13 @@ #ifndef _SPARSE_HASH_MAP_H_ #define _SPARSE_HASH_MAP_H_ -#include +#include "./internal/sparseconfig.h" #include // needed by stl_alloc #include // for equal_to<>, select1st<>, etc #include // for alloc #include // for pair<> -#include -#include // IWYU pragma: export +#include "./internal/libc_allocator_with_realloc.h" +#include "./internal/sparsehashtable.h" // IWYU pragma: export #include HASH_FUN_H // for hash<> _START_GOOGLE_NAMESPACE_ diff --git a/src/includes/3thparty/sparsehash/sparsetable b/src/includes/3thparty/sparsehash/sparsetable index 6259ebd..0b1a9e3 100644 --- a/src/includes/3thparty/sparsehash/sparsetable +++ b/src/includes/3thparty/sparsehash/sparsetable @@ -224,7 +224,7 @@ #ifndef UTIL_GTL_SPARSETABLE_H_ #define UTIL_GTL_SPARSETABLE_H_ -#include +#include "/internal/sparseconfig.h" #include // for malloc/free #include // to read/write tables #include // for memcpy @@ -242,9 +242,9 @@ #include // equal, lexicographical_compare, swap,... #include // uninitialized_copy, uninitialized_fill #include // a sparsetable is a vector of groups -#include -#include -#include +#include "./type_traits.h" +#include "./internal/hashtable-common.h" +#include "./internal/libc_allocator_with_realloc.h" // A lot of work to get a type that's guaranteed to be 16 bits... #ifndef HAVE_U_INT16_T diff --git a/src/includes/3thparty/sparsehash/template_util.h b/src/includes/3thparty/sparsehash/template_util.h index 6fec3d0..4895750 100644 --- a/src/includes/3thparty/sparsehash/template_util.h +++ b/src/includes/3thparty/sparsehash/template_util.h @@ -49,7 +49,7 @@ #ifndef BASE_TEMPLATE_UTIL_H_ #define BASE_TEMPLATE_UTIL_H_ -#include +#include "./internal/sparseconfig.h" _START_GOOGLE_NAMESPACE_ // Types small_ and big_ are guaranteed such that sizeof(small_) < diff --git a/src/includes/3thparty/sparsehash/type_traits.h b/src/includes/3thparty/sparsehash/type_traits.h index f909cf9..7958e4c 100644 --- a/src/includes/3thparty/sparsehash/type_traits.h +++ b/src/includes/3thparty/sparsehash/type_traits.h @@ -57,10 +57,10 @@ #ifndef BASE_TYPE_TRAITS_H_ #define BASE_TYPE_TRAITS_H_ -#include +#include "./internal/sparseconfig.h" #include // For pair -#include // For true_type and false_type +#include "./template_util.h" // For true_type and false_type _START_GOOGLE_NAMESPACE_