sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
artemp 2013-01-10 20:53:00 +00:00
commit c649fa63dc
8 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -1666,6 +1666,9 @@ if not HELP_REQUESTED:
# Install headers
SConscript('include/build.py')
# Install auxiliary headers
SConscript('deps/build.py')
# Build the requested and able-to-be-compiled input plug-ins
GDAL_BUILT = False
OGR_BUILT = False

6
deps/sparsehash/dense_hash_map vendored
View file

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

8
deps/sparsehash/internal/densehashtable.h vendored
View file

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

2
deps/sparsehash/internal/hashtable-common.h vendored
View file

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

2
deps/sparsehash/internal/libc_allocator_with_realloc.h vendored
View file

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

2
deps/sparsehash/template_util.h vendored
View file

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

4
deps/sparsehash/type_traits.h vendored
View file

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

2
include/mapnik/palette.hpp
View file

@ -31,7 +31,7 @@
#define USE_DENSE_HASH_MAP
#ifdef USE_DENSE_HASH_MAP
#include "deps/sparsehash/dense_hash_map"
#include <mapnik/sparsehash/dense_hash_map>
typedef google::dense_hash_map<unsigned int, unsigned char> rgba_hash_table;
#else
#warning compiling without dense_hash_map