From 720fbc74a1f5f4fe4cb46a363c1abeac5d781067 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Wed, 29 Jan 2020 14:05:41 +0000 Subject: [PATCH] move sparsehash out of mapnik dir --- deps/{mapnik => }/sparsehash/dense_hash_map | 6 +++--- deps/{mapnik => }/sparsehash/internal/densehashtable.h | 8 ++++---- deps/{mapnik => }/sparsehash/internal/hashtable-common.h | 2 +- .../sparsehash/internal/libc_allocator_with_realloc.h | 2 +- deps/{mapnik => }/sparsehash/internal/sparseconfig.h | 0 deps/{mapnik => }/sparsehash/template_util.h | 2 +- deps/{mapnik => }/sparsehash/type_traits.h | 4 ++-- include/build.py | 4 ++-- include/mapnik/palette.hpp | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename deps/{mapnik => }/sparsehash/dense_hash_map (98%) rename deps/{mapnik => }/sparsehash/internal/densehashtable.h (99%) rename deps/{mapnik => }/sparsehash/internal/hashtable-common.h (99%) rename deps/{mapnik => }/sparsehash/internal/libc_allocator_with_realloc.h (98%) rename deps/{mapnik => }/sparsehash/internal/sparseconfig.h (100%) rename deps/{mapnik => }/sparsehash/template_util.h (98%) rename deps/{mapnik => }/sparsehash/type_traits.h (99%) diff --git a/deps/mapnik/sparsehash/dense_hash_map b/deps/sparsehash/dense_hash_map similarity index 98% rename from deps/mapnik/sparsehash/dense_hash_map rename to deps/sparsehash/dense_hash_map index 3ef826a8c..05fd580e6 100644 --- a/deps/mapnik/sparsehash/dense_hash_map +++ b/deps/sparsehash/dense_hash_map @@ -96,13 +96,13 @@ #ifndef _DENSE_HASH_MAP_H_ #define _DENSE_HASH_MAP_H_ -#include +#include #include // needed by stl_alloc #include // for equal_to<>, select1st<>, etc #include // for alloc #include // for pair<> -#include // IWYU pragma: export -#include +#include // IWYU pragma: export +#include #include HASH_FUN_H // for hash<> _START_GOOGLE_NAMESPACE_ diff --git a/deps/mapnik/sparsehash/internal/densehashtable.h b/deps/sparsehash/internal/densehashtable.h similarity index 99% rename from deps/mapnik/sparsehash/internal/densehashtable.h rename to deps/sparsehash/internal/densehashtable.h index c0a2fedca..5ac7fdc8e 100644 --- a/deps/mapnik/sparsehash/internal/densehashtable.h +++ b/deps/sparsehash/internal/densehashtable.h @@ -89,7 +89,7 @@ #ifndef _DENSEHASHTABLE_H_ #define _DENSEHASHTABLE_H_ -#include +#include #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 +#include +#include #include // For length_error _START_GOOGLE_NAMESPACE_ diff --git a/deps/mapnik/sparsehash/internal/hashtable-common.h b/deps/sparsehash/internal/hashtable-common.h similarity index 99% rename from deps/mapnik/sparsehash/internal/hashtable-common.h rename to deps/sparsehash/internal/hashtable-common.h index fa403e6aa..cbb4ec2fd 100644 --- a/deps/mapnik/sparsehash/internal/hashtable-common.h +++ b/deps/sparsehash/internal/hashtable-common.h @@ -40,7 +40,7 @@ #ifndef UTIL_GTL_HASHTABLE_COMMON_H_ #define UTIL_GTL_HASHTABLE_COMMON_H_ -#include +#include #include #include #include // for size_t diff --git a/deps/mapnik/sparsehash/internal/libc_allocator_with_realloc.h b/deps/sparsehash/internal/libc_allocator_with_realloc.h similarity index 98% rename from deps/mapnik/sparsehash/internal/libc_allocator_with_realloc.h rename to deps/sparsehash/internal/libc_allocator_with_realloc.h index 3689701b9..0c1e03d75 100644 --- a/deps/mapnik/sparsehash/internal/libc_allocator_with_realloc.h +++ b/deps/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 #include // for malloc/realloc/free #include // for ptrdiff_t #include // for placement new diff --git a/deps/mapnik/sparsehash/internal/sparseconfig.h b/deps/sparsehash/internal/sparseconfig.h similarity index 100% rename from deps/mapnik/sparsehash/internal/sparseconfig.h rename to deps/sparsehash/internal/sparseconfig.h diff --git a/deps/mapnik/sparsehash/template_util.h b/deps/sparsehash/template_util.h similarity index 98% rename from deps/mapnik/sparsehash/template_util.h rename to deps/sparsehash/template_util.h index d6f7fa64e..6fec3d092 100644 --- a/deps/mapnik/sparsehash/template_util.h +++ b/deps/sparsehash/template_util.h @@ -49,7 +49,7 @@ #ifndef BASE_TEMPLATE_UTIL_H_ #define BASE_TEMPLATE_UTIL_H_ -#include +#include _START_GOOGLE_NAMESPACE_ // Types small_ and big_ are guaranteed such that sizeof(small_) < diff --git a/deps/mapnik/sparsehash/type_traits.h b/deps/sparsehash/type_traits.h similarity index 99% rename from deps/mapnik/sparsehash/type_traits.h rename to deps/sparsehash/type_traits.h index c11904c82..f909cf9a3 100644 --- a/deps/mapnik/sparsehash/type_traits.h +++ b/deps/sparsehash/type_traits.h @@ -57,10 +57,10 @@ #ifndef BASE_TYPE_TRAITS_H_ #define BASE_TYPE_TRAITS_H_ -#include +#include #include // For pair -#include // For true_type and false_type +#include // For true_type and false_type _START_GOOGLE_NAMESPACE_ diff --git a/include/build.py b/include/build.py index fab900426..b297911d0 100644 --- a/include/build.py +++ b/include/build.py @@ -37,8 +37,8 @@ subdirglobs = [ ('json', 'mapnik/json/*.hpp'), ('markers_placements', 'mapnik/markers_placements/*.hpp'), ('renderer_common', 'mapnik/renderer_common/*.hpp'), - ('sparsehash', '../deps/mapnik/sparsehash/*'), - ('sparsehash/internal', '../deps/mapnik/sparsehash/internal/*'), + ('sparsehash', '../deps/sparsehash/*'), + ('sparsehash/internal', '../deps/sparsehash/internal/*'), ('svg', 'mapnik/svg/*.hpp'), ('text', 'mapnik/text/*.hpp'), ('text/formatting', 'mapnik/text/formatting/*.hpp'), diff --git a/include/mapnik/palette.hpp b/include/mapnik/palette.hpp index bf7a19ec7..1229b6db5 100644 --- a/include/mapnik/palette.hpp +++ b/include/mapnik/palette.hpp @@ -33,7 +33,7 @@ #pragma GCC diagnostic push #include #ifdef USE_DENSE_HASH_MAP -#include +#include using rgba_hash_table = google::dense_hash_map; #else #include