this is the most up to date working #2

Merged
MassiveAtoms merged 26 commits from moretables into master 2020-04-17 16:47:27 +00:00
9 changed files with 23 additions and 23 deletions
Showing only changes of commit f0f1aef39d - Show all commits

View File

@ -96,13 +96,13 @@
#ifndef _DENSE_HASH_MAP_H_ #ifndef _DENSE_HASH_MAP_H_
#define _DENSE_HASH_MAP_H_ #define _DENSE_HASH_MAP_H_
#include <sparsehash/internal/sparseconfig.h> #include "./internal/sparseconfig.h"
#include <algorithm> // needed by stl_alloc #include <algorithm> // needed by stl_alloc
#include <functional> // for equal_to<>, select1st<>, etc #include <functional> // for equal_to<>, select1st<>, etc
#include <memory> // for alloc #include <memory> // for alloc
#include <utility> // for pair<> #include <utility> // for pair<>
#include <sparsehash/internal/densehashtable.h> // IWYU pragma: export #include "./internal/densehashtable.h" // IWYU pragma: export
#include <sparsehash/internal/libc_allocator_with_realloc.h> #include "./internal/libc_allocator_with_realloc.h"
#include HASH_FUN_H // for hash<> #include HASH_FUN_H // for hash<>
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_

View File

@ -89,7 +89,7 @@
#ifndef _DENSEHASHTABLE_H_ #ifndef _DENSEHASHTABLE_H_
#define _DENSEHASHTABLE_H_ #define _DENSEHASHTABLE_H_
#include <sparsehash/internal/sparseconfig.h> #include "./internal/sparseconfig.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> // for FILE, fwrite, fread #include <stdio.h> // for FILE, fwrite, fread
#include <algorithm> // For swap(), eg #include <algorithm> // For swap(), eg
@ -97,9 +97,9 @@
#include <limits> // for numeric_limits #include <limits> // for numeric_limits
#include <memory> // For uninitialized_fill #include <memory> // For uninitialized_fill
#include <utility> // for pair #include <utility> // for pair
#include <sparsehash/internal/hashtable-common.h> #include "./internal/hashtable-common.h"
#include <sparsehash/internal/libc_allocator_with_realloc.h> #include "./internal/libc_allocator_with_realloc.h"
#include <sparsehash/type_traits.h> #include "./type_traits.h"
#include <stdexcept> // For length_error #include <stdexcept> // For length_error
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_

View File

@ -40,7 +40,7 @@
#ifndef UTIL_GTL_HASHTABLE_COMMON_H_ #ifndef UTIL_GTL_HASHTABLE_COMMON_H_
#define UTIL_GTL_HASHTABLE_COMMON_H_ #define UTIL_GTL_HASHTABLE_COMMON_H_
#include <sparsehash/internal/sparseconfig.h> #include "./internal/sparseconfig.h"
#include <assert.h> #include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h> // for size_t #include <stddef.h> // for size_t

View File

@ -32,7 +32,7 @@
#ifndef UTIL_GTL_LIBC_ALLOCATOR_WITH_REALLOC_H_ #ifndef UTIL_GTL_LIBC_ALLOCATOR_WITH_REALLOC_H_
#define UTIL_GTL_LIBC_ALLOCATOR_WITH_REALLOC_H_ #define UTIL_GTL_LIBC_ALLOCATOR_WITH_REALLOC_H_
#include <sparsehash/internal/sparseconfig.h> #include "./internal/sparseconfig.h"
#include <stdlib.h> // for malloc/realloc/free #include <stdlib.h> // for malloc/realloc/free
#include <stddef.h> // for ptrdiff_t #include <stddef.h> // for ptrdiff_t
#include <new> // for placement new #include <new> // for placement new

View File

@ -95,15 +95,15 @@
#ifndef _SPARSEHASHTABLE_H_ #ifndef _SPARSEHASHTABLE_H_
#define _SPARSEHASHTABLE_H_ #define _SPARSEHASHTABLE_H_
#include <sparsehash/internal/sparseconfig.h> #include "./internal/sparseconfig.h"
#include <assert.h> #include <assert.h>
#include <algorithm> // For swap(), eg #include <algorithm> // For swap(), eg
#include <iterator> // for iterator tags #include <iterator> // for iterator tags
#include <limits> // for numeric_limits #include <limits> // for numeric_limits
#include <utility> // for pair #include <utility> // for pair
#include <sparsehash/type_traits.h> // for remove_const #include "./type_traits.h" // for remove_const
#include <sparsehash/internal/hashtable-common.h> #include "./internal/hashtable-common.h"
#include <sparsehash/sparsetable> // IWYU pragma: export #include "./sparsetable" // IWYU pragma: export
#include <stdexcept> // For length_error #include <stdexcept> // For length_error
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_

View File

@ -84,13 +84,13 @@
#ifndef _SPARSE_HASH_MAP_H_ #ifndef _SPARSE_HASH_MAP_H_
#define _SPARSE_HASH_MAP_H_ #define _SPARSE_HASH_MAP_H_
#include <sparsehash/internal/sparseconfig.h> #include "./internal/sparseconfig.h"
#include <algorithm> // needed by stl_alloc #include <algorithm> // needed by stl_alloc
#include <functional> // for equal_to<>, select1st<>, etc #include <functional> // for equal_to<>, select1st<>, etc
#include <memory> // for alloc #include <memory> // for alloc
#include <utility> // for pair<> #include <utility> // for pair<>
#include <sparsehash/internal/libc_allocator_with_realloc.h> #include "./internal/libc_allocator_with_realloc.h"
#include <sparsehash/internal/sparsehashtable.h> // IWYU pragma: export #include "./internal/sparsehashtable.h" // IWYU pragma: export
#include HASH_FUN_H // for hash<> #include HASH_FUN_H // for hash<>
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_

View File

@ -224,7 +224,7 @@
#ifndef UTIL_GTL_SPARSETABLE_H_ #ifndef UTIL_GTL_SPARSETABLE_H_
#define UTIL_GTL_SPARSETABLE_H_ #define UTIL_GTL_SPARSETABLE_H_
#include <sparsehash/internal/sparseconfig.h> #include "/internal/sparseconfig.h"
#include <stdlib.h> // for malloc/free #include <stdlib.h> // for malloc/free
#include <stdio.h> // to read/write tables #include <stdio.h> // to read/write tables
#include <string.h> // for memcpy #include <string.h> // for memcpy
@ -242,9 +242,9 @@
#include <algorithm> // equal, lexicographical_compare, swap,... #include <algorithm> // equal, lexicographical_compare, swap,...
#include <memory> // uninitialized_copy, uninitialized_fill #include <memory> // uninitialized_copy, uninitialized_fill
#include <vector> // a sparsetable is a vector of groups #include <vector> // a sparsetable is a vector of groups
#include <sparsehash/type_traits.h> #include "./type_traits.h"
#include <sparsehash/internal/hashtable-common.h> #include "./internal/hashtable-common.h"
#include <sparsehash/internal/libc_allocator_with_realloc.h> #include "./internal/libc_allocator_with_realloc.h"
// A lot of work to get a type that's guaranteed to be 16 bits... // A lot of work to get a type that's guaranteed to be 16 bits...
#ifndef HAVE_U_INT16_T #ifndef HAVE_U_INT16_T

View File

@ -49,7 +49,7 @@
#ifndef BASE_TEMPLATE_UTIL_H_ #ifndef BASE_TEMPLATE_UTIL_H_
#define BASE_TEMPLATE_UTIL_H_ #define BASE_TEMPLATE_UTIL_H_
#include <sparsehash/internal/sparseconfig.h> #include "./internal/sparseconfig.h"
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_
// Types small_ and big_ are guaranteed such that sizeof(small_) < // Types small_ and big_ are guaranteed such that sizeof(small_) <

View File

@ -57,10 +57,10 @@
#ifndef BASE_TYPE_TRAITS_H_ #ifndef BASE_TYPE_TRAITS_H_
#define BASE_TYPE_TRAITS_H_ #define BASE_TYPE_TRAITS_H_
#include <sparsehash/internal/sparseconfig.h> #include "./internal/sparseconfig.h"
#include <utility> // For pair #include <utility> // For pair
#include <sparsehash/template_util.h> // For true_type and false_type #include "./template_util.h" // For true_type and false_type
_START_GOOGLE_NAMESPACE_ _START_GOOGLE_NAMESPACE_